summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-14 21:39:09 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-14 21:41:29 -0700
commite7cbb90ad244b9d3ba5c6d57aec05d6c73df0a98 (patch)
tree4bd9fd23e151dbe75f0feb87c27a295e830e5c86 /drivers/input
parentbd7e4e85f3b8e5c7ea2f09d0b3350b264e339a14 (diff)
downloadlinux-stable-e7cbb90ad244b9d3ba5c6d57aec05d6c73df0a98.tar.gz
linux-stable-e7cbb90ad244b9d3ba5c6d57aec05d6c73df0a98.tar.bz2
linux-stable-e7cbb90ad244b9d3ba5c6d57aec05d6c73df0a98.zip
Input: wm831x-ts - ensure the controller is in a known state on open
Explicitly set all the enable bits when opening the device just in case something left the device in an unexpected state. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/wm831x-ts.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
index 3db0c29f3b05..6ae054f8e0aa 100644
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -167,7 +167,9 @@ static int wm831x_ts_input_open(struct input_dev *idev)
struct wm831x *wm831x = wm831x_ts->wm831x;
wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
- WM831X_TCH_ENA, WM831X_TCH_ENA);
+ WM831X_TCH_ENA | WM831X_TCH_CVT_ENA |
+ WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+ WM831X_TCH_Z_ENA, WM831X_TCH_ENA);
wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
WM831X_TCH_CVT_ENA, WM831X_TCH_CVT_ENA);