summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2010-07-29 17:50:51 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-02 17:06:04 -0700
commit019415ce5e00bcc0287f2ea88042b9fb685cdbcf (patch)
tree09120c0c6d6f91994631847bc71cde77efb44f33 /drivers/staging/iio
parentccea5e1d0f393df38c23034d97e939b2f5c9d6bc (diff)
downloadop-kernel-dev-019415ce5e00bcc0287f2ea88042b9fb685cdbcf.zip
op-kernel-dev-019415ce5e00bcc0287f2ea88042b9fb685cdbcf.tar.gz
staging: iio: ring_sw Fix pointer arithmetic for 64bit arches by using phys_addr_t
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r--drivers/staging/iio/ring_sw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index 9b3598e2..e2f01c6 100644
--- a/drivers/staging/iio/ring_sw.c
+++ b/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,
OpenPOWER on IntegriCloud