From: Peter Ujfalusi Date: Tue, 22 Nov 2016 13:41:23 +0000 (+0200) Subject: backlight: pwm_bl: Check the PWM state for initial backlight power state X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1b81294575098d989be1f2f6bb628091ceaa87b;p=linux.git backlight: pwm_bl: Check the PWM state for initial backlight power state If the PWM is not enabled the backlight initially should not be enabled either if we have booted with DT and there is a phandle pointing to the backlight node. The patch extends the checks to decide if we should keep the backlight off initially. Signed-off-by: Peter Ujfalusi Acked-by: Philipp Zabel Reviewed-by: Thierry Reding Signed-off-by: Lee Jones --- diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 5712ddd053ddd..d7efcb632f7d9 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -215,6 +215,10 @@ static int pwm_backlight_initial_power_state(const struct pwm_bl_data *pb) if (!regulator_is_enabled(pb->power_supply)) return FB_BLANK_POWERDOWN; + /* The PWM is disabled, keep it like this */ + if (!pwm_is_enabled(pb->pwm)) + return FB_BLANK_POWERDOWN; + return FB_BLANK_UNBLANK; }