1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 891a4dc608af..ee8e2b3a117e 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -388,20 +388,15 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
         struct drm_plane *plane = NULL;
         struct omap_plane *omap_plane;
         struct omap_overlay_info *info;
-        int ret;
 
         DBG("%s: priv=%d", plane_names[id], private_plane);
 
         omap_plane = kzalloc(sizeof(*omap_plane), GFP_KERNEL);
         if (!omap_plane)
-                goto fail;
+                return NULL;
 
-        ret = drm_flip_work_init(&omap_plane->unpin_work, 16,
+        drm_flip_work_init(&omap_plane->unpin_work,
                         "unpin", unpin_worker);
-        if (ret) {
-                dev_err(dev->dev, "could not allocate unpin FIFO\n");
-                goto fail;
-        }
 
         omap_plane->nformats = omap_framebuffer_get_formats(
                         omap_plane->formats, ARRAY_SIZE(omap_plane->formats),
@@ -443,10 +438,4 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
                 omap_plane->info.zorder = id;
 
         return plane;
-
-fail:
-        if (plane)
-                omap_plane_destroy(plane);
-
-        return NULL;
 }