projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'e26a9e0' into stable/for-linus-3.15
[cascardo/linux.git]
/
drivers
/
staging
/
iio
/
adc
/
mxs-lradc.c
diff --git
a/drivers/staging/iio/adc/mxs-lradc.c
b/drivers/staging/iio/adc/mxs-lradc.c
index
7fc66a6
..
514844e
100644
(file)
--- a/
drivers/staging/iio/adc/mxs-lradc.c
+++ b/
drivers/staging/iio/adc/mxs-lradc.c
@@
-757,6
+757,7
@@
static void mxs_lradc_finish_touch_event(struct mxs_lradc *lradc, bool valid)
}
/* if it is released, wait for the next touch via IRQ */
+ lradc->cur_plate = LRADC_TOUCH;
mxs_lradc_reg_clear(lradc, LRADC_CTRL1_TOUCH_DETECT_IRQ, LRADC_CTRL1);
mxs_lradc_reg_set(lradc, LRADC_CTRL1_TOUCH_DETECT_IRQ_EN, LRADC_CTRL1);
}