Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / iio / accel / bmc150-accel-core.c

diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index 197e693e7e7b795e9002e10430fd3f41399f96a7..bf17aae6614535b0ab3d68d3bfd84aec653a2f45 100644 (file)
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -901,7 +901,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
         */
        if (!irq) {
                data->old_timestamp = data->timestamp;
-               data->timestamp = iio_get_time_ns();
+               data->timestamp = iio_get_time_ns(indio_dev);
        }
 
        /*
@@ -1303,7 +1303,7 @@ static irqreturn_t bmc150_accel_irq_handler(int irq, void *private)
        int i;
 
        data->old_timestamp = data->timestamp;
-       data->timestamp = iio_get_time_ns();
+       data->timestamp = iio_get_time_ns(indio_dev);
 
        for (i = 0; i < BMC150_ACCEL_TRIGGERS; i++) {
                if (data->triggers[i].enabled) {