diff options
| author | Greg Kroah-Hartman | 2014-03-03 05:12:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-03-03 05:12:54 +0100 |
| commit | 17b02809cfa77abcab155ce3afbb1467e7f0744f (patch) | |
| tree | 4bb7b08fa29e73fb29a8e56fec766643b1eaa82e /drivers/staging/iio | |
| parent | staging: tidspbridge: fixed space coding style (diff) | |
| parent | Linux 3.14-rc5 (diff) | |
| download | kernel-qcow2-linux-17b02809cfa77abcab155ce3afbb1467e7f0744f.tar.gz kernel-qcow2-linux-17b02809cfa77abcab155ce3afbb1467e7f0744f.tar.xz kernel-qcow2-linux-17b02809cfa77abcab155ce3afbb1467e7f0744f.zip | |
Merge 3.14-rc5 into staging-next
We want those fixes in here
Diffstat (limited to 'drivers/staging/iio')
| -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 ab3c0d4ba68e..25bea0556c1e 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); } |