mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
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
This commit is contained in:
commit
9e26220286
1 changed files with 3 additions and 6 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue