diff mbox

drm/omap: checking for NULL instead of IS_ERR()

Message ID 20150731093330.GA11127@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter July 31, 2015, 9:33 a.m. UTC 
We recently start using the new drm_fb_helper functions but the error
handling needs to be updated as well to check for IS_ERR() instead of
NULL.

Fixes: 377eb331375f ('drm/omap: Use new drm_fb_helper functions')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Archit Taneja July 31, 2015, 9:46 a.m. UTC | #1 
Hi,

On 07/31/2015 03:03 PM, Dan Carpenter wrote:
> We recently start using the new drm_fb_helper functions but the error
> handling needs to be updated as well to check for IS_ERR() instead of
> NULL.
>
> Fixes: 377eb331375f ('drm/omap: Use new drm_fb_helper functions')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
> index 08ef090..b8e4cde 100644
> --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
> +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
> @@ -180,9 +180,9 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
>   	mutex_lock(&dev->struct_mutex);
>
>   	fbi = drm_fb_helper_alloc_fbi(helper);
> -	if (!fbi) {
> +	if (IS_ERR(fbi)) {
>   		dev_err(dev->dev, "failed to allocate fb info\n");
> -		ret = -ENOMEM;
> +		ret = PTR_ERR(fbi);
>   		goto fail_unlock;
>   	}

I was going to post out a v3 for this set. I'll squash this and mention
the fix in the changelog.

Thanks,
Archit

>
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 08ef090..b8e4cde 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -180,9 +180,9 @@  static int omap_fbdev_create(struct drm_fb_helper *helper,
 	mutex_lock(&dev->struct_mutex);
 
 	fbi = drm_fb_helper_alloc_fbi(helper);
-	if (!fbi) {
+	if (IS_ERR(fbi)) {
 		dev_err(dev->dev, "failed to allocate fb info\n");
-		ret = -ENOMEM;
+		ret = PTR_ERR(fbi);
 		goto fail_unlock;
 	}