diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 18:56:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 18:56:53 -0700 |
| commit | 3477d168ba61c5b0ca42d3d4642f3463609a5417 (patch) | |
| tree | 214be9b07ecb018f6ed50f2c2360b32e90424d00 /drivers | |
| parent | 9a687aea2ffd8ab1e3c6239ea53c0a2209707bd5 (diff) | |
| parent | 0c9501f823a40a061f755d3789c4705c9fe85f14 (diff) | |
Merge tag 'backlight-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"Fix-ups:
- Remove unused .owner assignment; tosa_bl
- Enable GPIO sleeping; pwm_bl"
* tag 'backlight-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: pwm_bl: Handle gpio that can sleep
backlight-tosa: Delete unnecessary assignment for the field "owner"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/backlight/pwm_bl.c | 4 | ||||
| -rw-r--r-- | drivers/video/backlight/tosa_bl.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index b2b366bb0f97..12614006211e 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -55,7 +55,7 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness) dev_err(pb->dev, "failed to enable power supply\n"); if (pb->enable_gpio) - gpiod_set_value(pb->enable_gpio, 1); + gpiod_set_value_cansleep(pb->enable_gpio, 1); pwm_enable(pb->pwm); pb->enabled = true; @@ -70,7 +70,7 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb) pwm_disable(pb->pwm); if (pb->enable_gpio) - gpiod_set_value(pb->enable_gpio, 0); + gpiod_set_value_cansleep(pb->enable_gpio, 0); regulator_disable(pb->power_supply); pb->enabled = false; diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c index 83742d806391..97067597e6bf 100644 --- a/drivers/video/backlight/tosa_bl.c +++ b/drivers/video/backlight/tosa_bl.c @@ -163,7 +163,6 @@ MODULE_DEVICE_TABLE(i2c, tosa_bl_id); static struct i2c_driver tosa_bl_driver = { .driver = { .name = "tosa-bl", - .owner = THIS_MODULE, .pm = &tosa_bl_pm_ops, }, .probe = tosa_bl_probe, |