Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux.git] / drivers / gpu / drm / omapdrm / omap_encoder.c

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 7e1f2ab653729edc653438d43eca1619e8c49011..21d126d0317ebc31ad5b28938ac1ef0452e6bbe1 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -147,10 +147,8 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev,
        struct omap_encoder *omap_encoder;
 
        omap_encoder = kzalloc(sizeof(*omap_encoder), GFP_KERNEL);
-       if (!omap_encoder) {
-               dev_err(dev->dev, "could not allocate encoder\n");
+       if (!omap_encoder)
                goto fail;
-       }
 
        omap_encoder->dssdev = dssdev;