Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / omapdrm / omap_plane.c

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index dd68d14ce61588c1c0ca3f4f4f227a7bf9a06ba4..2882cda6ea19de38039f498a9a7fa31e488d92c7 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -390,10 +390,8 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
        DBG("%s: priv=%d", plane_names[id], private_plane);
 
        omap_plane = kzalloc(sizeof(*omap_plane), GFP_KERNEL);
-       if (!omap_plane) {
-               dev_err(dev->dev, "could not allocate plane\n");
+       if (!omap_plane)
                goto fail;
-       }
 
        ret = kfifo_alloc(&omap_plane->unpin_fifo, 16, GFP_KERNEL);
        if (ret) {