From ab5d205974bc5cd637a5902b72e91920f1f6a577 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Sat, 20 Oct 2012 10:32:47 +0000 Subject: [PATCH] --- yaml --- r: 334724 b: refs/heads/master c: 028132451667ffd25b6814d47a622ec03cb8cba7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_fb_cma_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a6b0a49e9867..daf5bd1d9842 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0d78d08e3c06ebe2eb45b4d84f8cd5d1b13d371 +refs/heads/master: 028132451667ffd25b6814d47a622ec03cb8cba7 diff --git a/trunk/drivers/gpu/drm/drm_fb_cma_helper.c b/trunk/drivers/gpu/drm/drm_fb_cma_helper.c index d6c80a34b830..fd9d0af4d536 100644 --- a/trunk/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/trunk/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);