diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 09:58:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 09:58:20 -0800 |
| commit | 04e0361848afbe86fbf8b80945568df4c5bf6f07 (patch) | |
| tree | 9a9efaa13fb5b5aada183eefd94edfee6bcee830 /drivers/video | |
| parent | f8d35403ebf5a6cce6a2347015f465a4da470f7b (diff) | |
| parent | cec2b18832e26bc866bef2be22eff4e25bbc4034 (diff) | |
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
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/backlight/pwm_bl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index feb90764a811..53b8ceea9bde 100644 --- 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 */ |