Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / drivers / video / backlight / ili9320.c

diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index e2b8b40..2cf39e6 100644 (file)
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -219,10 +219,8 @@ int ili9320_probe_spi(struct spi_device *spi,
        /* allocate and initialse our state */
 
        ili = devm_kzalloc(&spi->dev, sizeof(struct ili9320), GFP_KERNEL);
-       if (ili == NULL) {
-               dev_err(dev, "no memory for device\n");
+       if (ili == NULL)
                return -ENOMEM;
-       }
 
        ili->access.spi.id = ILI9320_SPI_IDCODE | ILI9320_SPI_ID(1);