diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-11-12 15:09:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 12:09:21 +0900 |
commit | ad5066d4c2b1d696749f8d7816357c23b648c4d3 (patch) | |
tree | 2746b58f70d4ff302c09f3be817b73107457c285 /drivers/video/backlight | |
parent | 185d91442550110db67a7dc794a32efcea455a36 (diff) | |
download | blackbird-op-linux-ad5066d4c2b1d696749f8d7816357c23b648c4d3.tar.gz blackbird-op-linux-ad5066d4c2b1d696749f8d7816357c23b648c4d3.zip |
backlight: atmel-pwm-bl: fix gpio polarity in remove
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/backlight')
-rw-r--r-- | drivers/video/backlight/atmel-pwm-bl.c | 6 |
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 0971a8e78fbd..e21beb6ad943 100644 --- a/drivers/video/backlight/atmel-pwm-bl.c +++ b/drivers/video/backlight/atmel-pwm-bl.c @@ -205,8 +205,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) { struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev); - if (pwmbl->gpio_on != -1) - gpio_set_value(pwmbl->gpio_on, 0); + if (pwmbl->gpio_on != -1) { + gpio_set_value(pwmbl->gpio_on, + 0 ^ pwmbl->pdata->on_active_low); + } pwm_channel_disable(&pwmbl->pwmc); pwm_channel_free(&pwmbl->pwmc); |