aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-28 17:08:03 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-28 17:08:03 -0800
commitd3dae4ad180a2f7994bda854f5fc820b5067af7b (patch)
tree0d6ee9ad5bde7dda1b54d00109e180f646bac5fe
parent260ea9c2e2d330303163e286ab01b66dbcfe3a6f (diff)
parent760dbe1dcb6d3dd3ead73dc69b23f206b52273bb (diff)
downloadlinux-stericsson-d3dae4ad180a2f7994bda854f5fc820b5067af7b.tar.gz
Merge tag 'fixes-for-3.14d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes: Fourth set of IIO fixes for the 3.14 kernel. A single line patch fixing a regression that was introduced in 3.13 in the reworking of the mxs touch screen and ADC drivers to be interrupt rather than polling driven. It resulted in a stray double reporting of the release coordinate in the touch screen driver. The bug lay in the adc side of the driver which left the statemachine in the wrong state.
-rw-r--r--drivers/staging/iio/adc/mxs-lradc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index 7fc66a6a6e36..514844efac75 100644
--- 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);
}