aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/rockchip
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2015-01-07 04:27:06 -0500
committerMark Yao <mark.yao@rock-chips.com>2015-01-08 22:29:06 -0500
commit4b9a90c0b374f8f7b3ceabe3c202424c98a6c5a4 (patch)
tree2ee8991dcfd90a81e0a78caf08bf6c21c18ee3c7 /drivers/gpu/drm/rockchip
parentc93546a5e32bd788c22aefa072385f3784551c13 (diff)
drm/rockchip: fix dma_alloc_attrs() error check
dma_alloc_attrs() returns NULL if it cannot allocate a dma buffer (or mapping), not a negative error code. Rerported-by: Pawel Osciak <posciak@chromium.org> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Diffstat (limited to 'drivers/gpu/drm/rockchip')
-rw-r--r--drivers/gpu/drm/rockchip/rockchip_drm_gem.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index bc98a227dc76..7ca8799ef784 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -34,12 +34,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj)
34 rk_obj->kvaddr = dma_alloc_attrs(drm->dev, obj->size, 34 rk_obj->kvaddr = dma_alloc_attrs(drm->dev, obj->size,
35 &rk_obj->dma_addr, GFP_KERNEL, 35 &rk_obj->dma_addr, GFP_KERNEL,
36 &rk_obj->dma_attrs); 36 &rk_obj->dma_attrs);
37 if (IS_ERR(rk_obj->kvaddr)) { 37 if (!rk_obj->kvaddr) {
38 int ret = PTR_ERR(rk_obj->kvaddr); 38 DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
39 39 return -ENOMEM;
40 DRM_ERROR("failed to allocate %#x byte dma buffer, %d",
41 obj->size, ret);
42 return ret;
43 } 40 }
44 41
45 return 0; 42 return 0;