diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 15:21:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 15:21:28 +0200 |
| commit | 3f2dcb6411eb3fd4a8be5d3713be0e2c1c750d6d (patch) | |
| tree | 247bf8d27526c48f8508a39cad29eb61262f9d0a /drivers/video/backlight/lm3639_bl.c | |
| parent | Merge tag 'mfd-next-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/le... (diff) | |
| parent | backlight: Remove ld9040 driver (diff) | |
| download | linux-3f2dcb6411eb3fd4a8be5d3713be0e2c1c750d6d.tar.xz linux-3f2dcb6411eb3fd4a8be5d3713be0e2c1c750d6d.zip | |
Merge tag 'backlight-next-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"Old Drivers
- Remove driver for S6E63M0
- Remove driver for LD9040
Fix-ups
- Trivial (email address update); adp*_bl
- Use 'atomic' PWM API; pwm_bl
Bug Fixes
- Remove pointless boolen '&ptr' check; lm3639_bl"
* tag 'backlight-next-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: Remove ld9040 driver
backlight: Remove s6e63m0 driver
backlight: lm3639: Unconditionally call led_classdev_unregister
backlight: pwm_bl: Switch to using "atomic" PWM API
backlight: Update MODULE AUTHOR email address
Diffstat (limited to 'drivers/video/backlight/lm3639_bl.c')
| -rw-r--r-- | drivers/video/backlight/lm3639_bl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c index cd50df5807ea..086611c7bc03 100644 --- a/drivers/video/backlight/lm3639_bl.c +++ b/drivers/video/backlight/lm3639_bl.c @@ -400,10 +400,8 @@ static int lm3639_remove(struct i2c_client *client) regmap_write(pchip->regmap, REG_ENABLE, 0x00); - if (&pchip->cdev_torch) - led_classdev_unregister(&pchip->cdev_torch); - if (&pchip->cdev_flash) - led_classdev_unregister(&pchip->cdev_flash); + led_classdev_unregister(&pchip->cdev_torch); + led_classdev_unregister(&pchip->cdev_flash); if (pchip->bled) device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode); return 0; |