The goto error statement end up just returning NULL without performing any cleanup, replace it with a direct return.
Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/omapdrm/omap_gem.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 08ffcce1f62c..aa7a8484a6d0 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -1343,7 +1343,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, { struct omap_drm_private *priv = dev->dev_private; struct omap_gem_object *omap_obj; - struct drm_gem_object *obj = NULL; + struct drm_gem_object *obj; struct address_space *mapping; size_t size; int ret; @@ -1351,7 +1351,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, if (flags & OMAP_BO_TILED) { if (!priv->usergart) { dev_err(dev->dev, "Tiled buffers require DMM\n"); - goto fail; + return NULL; }
/* tiled buffers are always shmem paged backed.. when they are @@ -1424,9 +1424,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, return obj;
fail: - if (obj) - omap_gem_free_object(obj); - + omap_gem_free_object(obj); return NULL; }