---

yaml --- r: 206038 b: refs/heads/master c: 019415c h: refs/heads/master v: v3
git-mirror · Aug 3, 2010 · b0d8a8e · b0d8a8e
1 parent 9be35b4
commit b0d8a8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,