diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-07-29 12:50:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 20:06:04 -0400 |
commit | 019415ce5e00bcc0287f2ea88042b9fb685cdbcf (patch) | |
tree | 09120c0c6d6f91994631847bc71cde77efb44f33 | |
parent | ccea5e1d0f393df38c23034d97e939b2f5c9d6bc (diff) |
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>
-rw-r--r-- | drivers/staging/iio/ring_sw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c index 9b3598e228ad..e2f01c640baf 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) | |||
478 | 478 | ||
479 | /* Guaranteed to be aligned with 8 byte boundary */ | 479 | /* Guaranteed to be aligned with 8 byte boundary */ |
480 | if (st->indio_dev->scan_timestamp) | 480 | if (st->indio_dev->scan_timestamp) |
481 | *(s64 *)(((u32)data + len | 481 | *(s64 *)(((phys_addr_t)data + len |
482 | + sizeof(s64) - 1) & ~(sizeof(s64) - 1)) | 482 | + sizeof(s64) - 1) & ~(sizeof(s64) - 1)) |
483 | = st->last_timestamp; | 483 | = st->last_timestamp; |
484 | st->indio_dev->ring->access.store_to(st->indio_dev->ring, | 484 | st->indio_dev->ring->access.store_to(st->indio_dev->ring, |