Merge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / hx8357.c

diff --git a/drivers/video/backlight/hx8357.c b/drivers/video/backlight/hx8357.c
index 985e854e244b108cc2dce384dc91dbb8f5f8ea73..23f50b92a930b25f80986a529f2bad3fb5d6c877 100644 (file)
--- a/drivers/video/backlight/hx8357.c
+++ b/drivers/video/backlight/hx8357.c
@@ -587,10 +587,8 @@ static int hx8357_probe(struct spi_device *spi)
        int i, ret;
 
        lcd = devm_kzalloc(&spi->dev, sizeof(*lcd), GFP_KERNEL);
-       if (!lcd) {
-               dev_err(&spi->dev, "Couldn't allocate lcd internal structure!\n");
+       if (!lcd)
                return -ENOMEM;
-       }
 
        ret = spi_setup(spi);
        if (ret < 0) {