Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e262202 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next' of https://github.com/markyzq/kernel-drm-rockchip into drm-next 

single rockchip fix.

* 'drm-next' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: fix dma_alloc_attrs() error check
parents cc0cc1aa 4b9a90c0

drivers/gpu/drm/rockchip/rockchip_drm_gem.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -34,12 +34,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj) 
	rk_obj->kvaddr = dma_alloc_attrs(drm->dev, obj->size,

	rk_obj->kvaddr = dma_alloc_attrs(drm->dev, obj->size,

					 &rk_obj->dma_addr, GFP_KERNEL,

					 &rk_obj->dma_addr, GFP_KERNEL,

					 &rk_obj->dma_attrs);

					 &rk_obj->dma_attrs);

	if (IS_ERR(rk_obj->kvaddr)) {

	if (!rk_obj->kvaddr) {

		int ret = PTR_ERR(rk_obj->kvaddr);

		DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);



		return -ENOMEM;

		DRM_ERROR("failed to allocate %#x byte dma buffer, %d",

			  obj->size, ret);

		return ret;

	}

	}





	return 0;

	return 0;