Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

[karo-tx-linux.git] / drivers / video / backlight / ld9040.c

diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index ccb44e8e492721e981bc09dd98e58338020f6c48..f71eaf10c4ebddac11a32b5ec5baf03519743dc0 100644 (file)
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -566,11 +566,11 @@ static int ld9040_power_on(struct ld9040 *lcd)
        if (!pd->reset) {
                dev_err(lcd->dev, "reset is NULL.\n");
                return -EINVAL;
-       } else {
-               pd->reset(lcd->ld);
-               msleep(pd->reset_delay);
        }
 
+       pd->reset(lcd->ld);
+       msleep(pd->reset_delay);
+
        ret = ld9040_ldi_init(lcd);
        if (ret) {
                dev_err(lcd->dev, "failed to initialize ldi.\n");