aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-11-12 18:09:39 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 13:55:47 -0500
commitfe619f64b93df39d3d6f4b60cd9fa3474e61ce5f (patch)
treef5468ee11827a2f97b59d8100c6ac73c670b24e6 /drivers/video
parent368289b373137db191a35ed9e6865e42ff7d0263 (diff)
backlight: atmel-pwm-bl: fix gpio polarity in remove
commit ad5066d4c2b1d696749f8d7816357c23b648c4d3 upstream. Make sure to honour gpio polarity also at remove so that the backlight is actually disabled on boards with active-low enable pin. Signed-off-by: Johan Hovold <jhovold@gmail.com> Acked-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/backlight/atmel-pwm-bl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
index 30e4ed52d701..6d2edeb85ac2 100644
--- a/drivers/video/backlight/atmel-pwm-bl.c
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -207,8 +207,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev)
207{ 207{
208 struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev); 208 struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev);
209 209
210 if (pwmbl->gpio_on != -1) 210 if (pwmbl->gpio_on != -1) {
211 gpio_set_value(pwmbl->gpio_on, 0); 211 gpio_set_value(pwmbl->gpio_on,
212 0 ^ pwmbl->pdata->on_active_low);
213 }
212 pwm_channel_disable(&pwmbl->pwmc); 214 pwm_channel_disable(&pwmbl->pwmc);
213 pwm_channel_free(&pwmbl->pwmc); 215 pwm_channel_free(&pwmbl->pwmc);
214 backlight_device_unregister(pwmbl->bldev); 216 backlight_device_unregister(pwmbl->bldev);