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; }
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;
goto fail_unlock; }ret = PTR_ERR(fbi);
I was going to post out a v3 for this set. I'll squash this and mention the fix in the changelog.
Thanks, Archit
dri-devel@lists.freedesktop.org