aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2010-05-19 10:11:13 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-05-19 10:13:35 -0700
commitaf8b01b03941e6b008d63b42c0433699c3d3d184 (patch)
tree4887d7494ea3f6b5f3c5d2f1b83864eec8d6fca1 /drivers/input
parentMerge commit 'v2.6.34' into next (diff)
downloadlinux-dev-af8b01b03941e6b008d63b42c0433699c3d3d184.tar.xz
linux-dev-af8b01b03941e6b008d63b42c0433699c3d3d184.zip
Input: wm9712 - fix wm97xx_set_gpio() logic
WM97XX_GPIO_HIGH is not a bitmap and should to be treated as such. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/wm97xx-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index 5109bf3dd858..cbfef1ea7e30 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -200,7 +200,7 @@ void wm97xx_set_gpio(struct wm97xx *wm, u32 gpio,
mutex_lock(&wm->codec_mutex);
reg = wm97xx_reg_read(wm, AC97_GPIO_STATUS);
- if (status & WM97XX_GPIO_HIGH)
+ if (status == WM97XX_GPIO_HIGH)
reg |= gpio;
else
reg &= ~gpio;