Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_gem_cma_helper.c

diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index 05c97c5350a1b3fde396ed7a0a17d0af7d85e755..e467e67af6e7111c69b96cb792380b5727500650 100644 (file)
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -327,7 +327,7 @@ drm_gem_cma_prime_import_sg_table(struct drm_device *dev, size_t size,
        /* Create a CMA GEM buffer. */
        cma_obj = __drm_gem_cma_create(dev, size);
        if (IS_ERR(cma_obj))
-               return ERR_PTR(PTR_ERR(cma_obj));
+               return ERR_CAST(cma_obj);
 
        cma_obj->paddr = sg_dma_address(sgt->sgl);
        cma_obj->sgt = sgt;