diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-01 02:08:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-01 02:08:03 +0100 |
| commit | d3dae4ad180a2f7994bda854f5fc820b5067af7b (patch) | |
| tree | 0d6ee9ad5bde7dda1b54d00109e180f646bac5fe | |
| parent | staging: r8188eu: Add new device ID (diff) | |
| parent | staging:iio:adc:MXS:LRADC: fix touchscreen statemachine (diff) | |
| download | linux-d3dae4ad180a2f7994bda854f5fc820b5067af7b.tar.xz linux-d3dae4ad180a2f7994bda854f5fc820b5067af7b.zip | |
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.c | 1 |
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); } |