diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 10:58:32 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 10:58:32 +0800 |
| commit | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (patch) | |
| tree | 00c8b9d215663f5b999cf4c7077bb79a05b3c5d0 /drivers/staging/iio/adc/mxs-lradc.c | |
| parent | 5210951a4876a42856434546d2789838d3e35f34 (diff) | |
| parent | bdcec2cf3acd0d9ef24c653b722596f49ef6a040 (diff) | |
Merge tag 'v3.14.37' into linux-linaro-lsk-v3.14linux-linaro-lsk-v3.14
This is the 3.14.37 stable release
Diffstat (limited to 'drivers/staging/iio/adc/mxs-lradc.c')
| -rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index be89260c23a6..27e1a6e62d06 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c @@ -1159,7 +1159,6 @@ static irqreturn_t mxs_lradc_handle_irq(int irq, void *data) LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL2)); } - if (iio_buffer_enabled(iio)) if (iio_buffer_enabled(iio)) { if (reg & lradc->buffer_vchans) iio_trigger_poll(iio->trig, iio_get_time_ns()); |