diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 12:45:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 12:45:50 -0700 |
| commit | af76004cf8b4f368583bda22d7e348e40a338b91 (patch) | |
| tree | 04b90663e2d2eede2b8051a7f7ff3a97073f50e5 /drivers/video/backlight/gpio_backlight.c | |
| parent | bae14e7a2dcb726476b5020396923a24ccc4c40b (diff) | |
| parent | ab1e59b4dc0370734ab3afb8de0c10a6f5a211ad (diff) | |
Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight fixes from Lee Jones:
"This merely contains some very basic build/run-time bug fixes"
* tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: gpio-backlight: Fix warning when the GPIO is on a I2C chip
video/backlight: s6e63m0: Fix string type mismatch
video/backlight: LP8788 needs PWM
video/backlight: LP855X needs PWM
video/pxa: LCD_CORGI needs BACKLIGHT_CLASS_DEVICE
video/backlight: LM3630A needs PWM
Diffstat (limited to 'drivers/video/backlight/gpio_backlight.c')
| -rw-r--r-- | drivers/video/backlight/gpio_backlight.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c index a2eba12e1cb..1cea68848f1 100644 --- a/drivers/video/backlight/gpio_backlight.c +++ b/drivers/video/backlight/gpio_backlight.c @@ -38,7 +38,8 @@ static int gpio_backlight_update_status(struct backlight_device *bl) bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) brightness = 0; - gpio_set_value(gbl->gpio, brightness ? gbl->active : !gbl->active); + gpio_set_value_cansleep(gbl->gpio, + brightness ? gbl->active : !gbl->active); return 0; } |