summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorMarkus Pargmann <mpa@pengutronix.de>2013-03-09 15:20:50 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-03-12 08:50:19 -0700
commitfa45255ee72649bd061116f7d3a765f5784bf078 (patch)
tree8ca2e5caecee1ac127abbd2ec859e4ccdff1a7a8 /drivers/input
parentcfd5d09691ee188a36c00f5c3b220fbf082a78d7 (diff)
downloadblackbird-obmc-linux-fa45255ee72649bd061116f7d3a765f5784bf078.tar.gz
blackbird-obmc-linux-fa45255ee72649bd061116f7d3a765f5784bf078.zip
Input: wm9712 - fix return code for wrong sample
Instead of interpreting a wrong measurement as pen up, we should try to read again. Based on wm9712: pen up by Teresa Gámez and Christian Hemp. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/wm9712.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c
index 6e743e3dfda4..a983da1744e8 100644
--- a/drivers/input/touchscreen/wm9712.c
+++ b/drivers/input/touchscreen/wm9712.c
@@ -298,7 +298,7 @@ static int wm9712_poll_sample(struct wm97xx *wm, int adcsel, int *sample)
dev_dbg(wm->dev, "adc wrong sample, wanted %x got %x",
adcsel & WM97XX_ADCSEL_MASK,
*sample & WM97XX_ADCSEL_MASK);
- return RC_PENUP;
+ return RC_AGAIN;
}
if (wants_pen && !(*sample & WM97XX_PEN_DOWN)) {
OpenPOWER on IntegriCloud