Merge tag 'backlight-next-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

Pull backlight fixlet from Lee Jones:
 "Allow GPIO call to sleep in pwm_bl driver"

* tag 'backlight-next-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index feb90764a8117d2818960267a608c270024a2e07..53b8ceea9bde15d8fb48b0679f34a496a00e77a8 100644 (file)
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -435,7 +435,7 @@ static int pwm_backlight_initial_power_state(const struct pwm_bl_data *pb)
         */
 
        /* if the enable GPIO is disabled, do not enable the backlight */
-       if (pb->enable_gpio && gpiod_get_value(pb->enable_gpio) == 0)
+       if (pb->enable_gpio && gpiod_get_value_cansleep(pb->enable_gpio) == 0)
                return FB_BLANK_POWERDOWN;
 
        /* The regulator is disabled, do not enable the backlight */