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

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

diff --git a/drivers/video/backlight/lms501kf03.c b/drivers/video/backlight/lms501kf03.c
index 77258b7b04be288214cba7ee141bf87402c514cf..7e3810308c3e456e56d5f5e6512fbef0bbc2d7dd 100644 (file)
--- a/drivers/video/backlight/lms501kf03.c
+++ b/drivers/video/backlight/lms501kf03.c
@@ -232,19 +232,19 @@ static int lms501kf03_power_on(struct lms501kf03 *lcd)
        if (!pd->power_on) {
                dev_err(lcd->dev, "power_on is NULL.\n");
                return -EINVAL;
-       } else {
-               pd->power_on(lcd->ld, 1);
-               msleep(pd->power_on_delay);
        }
 
+       pd->power_on(lcd->ld, 1);
+       msleep(pd->power_on_delay);
+
        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 = lms501kf03_ldi_init(lcd);
        if (ret) {
                dev_err(lcd->dev, "failed to initialize ldi.\n");