From: Thierry Reding Date: Sat, 20 Oct 2012 10:32:47 +0000 (+0000) Subject: drm: fb: cma: Fail gracefully on allocation failure X-Git-Tag: firefly_0821_release~3680^2~1722^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=028132451667ffd25b6814d47a622ec03cb8cba7;p=firefly-linux-kernel-4.4.55.git drm: fb: cma: Fail gracefully on allocation failure The drm_gem_cma_create() function never returns NULL but rather an error encoded in the return value using the ERR_PTR() macro. Callers therefore need to check for errors using the IS_ERR() macro. This change allows drivers to handle contiguous DMA allocation failures gracefully. Signed-off-by: Thierry Reding Acked-by: Sascha Hauer Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index d6c80a34b830..fd9d0af4d536 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -220,7 +220,7 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper, size = mode_cmd.pitches[0] * mode_cmd.height; obj = drm_gem_cma_create(dev, size); - if (!obj) + if (IS_ERR(obj)) return -ENOMEM; fbi = framebuffer_alloc(0, dev->dev);