From b0d8a8ebe61c8ab5400afeab3a8a7962a886d92e Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Thu, 29 Jul 2010 17:50:51 +0100 Subject: [PATCH] --- yaml --- r: 206038 b: refs/heads/master c: 019415ce5e00bcc0287f2ea88042b9fb685cdbcf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/ring_sw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca7ae475208e..cc229de67303 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccea5e1d0f393df38c23034d97e939b2f5c9d6bc +refs/heads/master: 019415ce5e00bcc0287f2ea88042b9fb685cdbcf diff --git a/trunk/drivers/staging/iio/ring_sw.c b/trunk/drivers/staging/iio/ring_sw.c index 9b3598e228ad..e2f01c640baf 100644 --- a/trunk/drivers/staging/iio/ring_sw.c +++ b/trunk/drivers/staging/iio/ring_sw.c @@ -478,7 +478,7 @@ void iio_sw_trigger_bh_to_ring(struct work_struct *work_s) /* Guaranteed to be aligned with 8 byte boundary */ if (st->indio_dev->scan_timestamp) - *(s64 *)(((u32)data + len + *(s64 *)(((phys_addr_t)data + len + sizeof(s64) - 1) & ~(sizeof(s64) - 1)) = st->last_timestamp; st->indio_dev->ring->access.store_to(st->indio_dev->ring,