diff options
| author | Greg Kroah-Hartman | 2015-12-14 04:23:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-12-14 04:23:01 +0100 |
| commit | 93c222c0e126c1c24ac454acf013f2c85e57bd8b (patch) | |
| tree | 920c429de92857aaf74e64a0f4f9fbaec7032fcf /drivers/iio/dummy | |
| parent | staging:iio:mxs-lradc Fix large integer implicitly truncated to unsigned warning (diff) | |
| parent | Linux 4.4-rc5 (diff) | |
| download | kernel-qcow2-linux-93c222c0e126c1c24ac454acf013f2c85e57bd8b.tar.gz kernel-qcow2-linux-93c222c0e126c1c24ac454acf013f2c85e57bd8b.tar.xz kernel-qcow2-linux-93c222c0e126c1c24ac454acf013f2c85e57bd8b.zip | |
Merge 4.4-rc5 into staging-next
We want those fixes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/dummy')
| -rw-r--r-- | drivers/iio/dummy/iio_simple_dummy_events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/dummy/iio_simple_dummy_events.c b/drivers/iio/dummy/iio_simple_dummy_events.c index bfbf1c56bd22..6eb600ff7056 100644 --- a/drivers/iio/dummy/iio_simple_dummy_events.c +++ b/drivers/iio/dummy/iio_simple_dummy_events.c @@ -159,7 +159,7 @@ static irqreturn_t iio_simple_dummy_get_timestamp(int irq, void *private) struct iio_dummy_state *st = iio_priv(indio_dev); st->event_timestamp = iio_get_time_ns(); - return IRQ_HANDLED; + return IRQ_WAKE_THREAD; } /** |