git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
iio
/
pressure
/
mpl3115.c
diff --git
a/drivers/iio/pressure/mpl3115.c
b/drivers/iio/pressure/mpl3115.c
index 01b2e0b1887881910874a43fb7efec4c4298a609..6392d7b62841024e237cc5a4d19bdb5b0fbb18b5 100644
(file)
--- a/
drivers/iio/pressure/mpl3115.c
+++ b/
drivers/iio/pressure/mpl3115.c
@@
-171,7
+171,7
@@
static irqreturn_t mpl3115_trigger_handler(int irq, void *p)
mutex_unlock(&data->lock);
iio_push_to_buffers_with_timestamp(indio_dev, buffer,
- iio_get_time_ns());
+ iio_get_time_ns(
indio_dev
));
done:
iio_trigger_notify_done(indio_dev->trig);