Commit 04e03618 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents f8d35403 cec2b188

drivers/video/backlight/pwm_bl.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE