diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-13 19:23:01 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-13 19:23:01 -0800 |
commit | 93c222c0e126c1c24ac454acf013f2c85e57bd8b (patch) | |
tree | 920c429de92857aaf74e64a0f4f9fbaec7032fcf /drivers/iio/dummy/iio_simple_dummy_events.c | |
parent | f89c2b39ce676cb08b6ed8848cde76dcb21cc672 (diff) | |
parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
download | op-kernel-dev-93c222c0e126c1c24ac454acf013f2c85e57bd8b.zip op-kernel-dev-93c222c0e126c1c24ac454acf013f2c85e57bd8b.tar.gz |
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/iio_simple_dummy_events.c')
-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 bfbf1c5..6eb600f 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; } /** |