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

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

diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c
index ea67fe199e34ed880c305fa1b0ca26f330eccccd..e7f0890cc21142f947eaf41e6975e5007ecf96ce 100644 (file)
--- a/drivers/video/backlight/ili922x.c
+++ b/drivers/video/backlight/ili922x.c
@@ -495,17 +495,18 @@ static int ili922x_probe(struct spi_device *spi)
                        "no LCD found: Chip ID 0x%x, ret %d\n",
                        reg, ret);
                return -ENODEV;
-       } else {
-               dev_info(&spi->dev, "ILI%x found, SPI freq %d, mode %d\n",
-                        reg, spi->max_speed_hz, spi->mode);
        }
 
+       dev_info(&spi->dev, "ILI%x found, SPI freq %d, mode %d\n",
+                reg, spi->max_speed_hz, spi->mode);
+
        ret = ili922x_read_status(spi, &reg);
        if (ret) {
                dev_err(&spi->dev, "reading RS failed...\n");
                return ret;
-       } else
-               dev_dbg(&spi->dev, "status: 0x%x\n", reg);
+       }
+
+       dev_dbg(&spi->dev, "status: 0x%x\n", reg);
 
        ili922x_display_init(spi);