Commit 4b9a90c0 authored by Daniel Kurtz's avatar Daniel Kurtz Committed by Mark Yao

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: default avatarPawel Osciak <posciak@chromium.org>
Signed-off-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Signed-off-by: default avatarMark Yao <mark.yao@rock-chips.com>
parent c93546a5
...@@ -34,12 +34,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment