diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:22:08 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:22:08 +0800 |
| commit | 877c2196bf43e410b8b1a66c7bbf7d5cb98a9f41 (patch) | |
| tree | f74b6a59cd223c470830b3e4f3e1b6a4270abc1a /drivers/staging | |
| parent | b95b6a6ddfae1513893676e444f585a106513688 (diff) | |
| parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Conflicts:
net/netfilter/xt_socket.c
Diffstat (limited to 'drivers/staging')
| -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()); |