aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-11-12 15:09:39 -0800
committerBen Hutchings <ben@decadent.org.uk>2014-01-03 04:33:21 +0000
commitfa01206912e5bc7c48e0a89d0da820062b018854 (patch)
tree603bd078334a46953dcf86c7cba952a563b28c98 /drivers/video
parent281f5afc26c7d7604685c8c1d686154f3354a5d1 (diff)
downloadkernel_samsung_smdk4412-fa01206912e5bc7c48e0a89d0da820062b018854.zip
kernel_samsung_smdk4412-fa01206912e5bc7c48e0a89d0da820062b018854.tar.gz
kernel_samsung_smdk4412-fa01206912e5bc7c48e0a89d0da820062b018854.tar.bz2
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> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/backlight/atmel-pwm-bl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
index 4d2bbd8..dab3a0c 100644
--- a/drivers/video/backlight/atmel-pwm-bl.c
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -211,7 +211,8 @@ static int __exit 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);
+ gpio_set_value(pwmbl->gpio_on,
+ 0 ^ pwmbl->pdata->on_active_low);
gpio_free(pwmbl->gpio_on);
}
pwm_channel_disable(&pwmbl->pwmc);