Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / drivers / iio / accel / bma180.c

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 81e3dc260993124981d45cacb9e472e9221d7b8a..28b39283bccffaad1fdd13950aaa62dabd2d7248 100644 (file)
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -471,13 +471,10 @@ static irqreturn_t bma180_trigger_handler(int irq, void *p)
        struct iio_poll_func *pf = p;
        struct iio_dev *indio_dev = pf->indio_dev;
        struct bma180_data *data = iio_priv(indio_dev);
+       int64_t time_ns = iio_get_time_ns();
        int bit, ret, i = 0;
 
        mutex_lock(&data->mutex);
-       if (indio_dev->scan_timestamp) {
-               ret = indio_dev->scan_bytes / sizeof(s64) - 1;
-               ((s64 *)data->buff)[ret] = iio_get_time_ns();
-       }
 
        for_each_set_bit(bit, indio_dev->buffer->scan_mask,
                         indio_dev->masklength) {
@@ -490,7 +487,7 @@ static irqreturn_t bma180_trigger_handler(int irq, void *p)
        }
        mutex_unlock(&data->mutex);
 
-       iio_push_to_buffers(indio_dev, (u8 *)data->buff);
+       iio_push_to_buffers_with_timestamp(indio_dev, data->buff, time_ns);
 err:
        iio_trigger_notify_done(indio_dev->trig);