---

yaml --- r: 318026 b: refs/heads/master c: 7958762 h: refs/heads/master v: v3
git-mirror · Jul 15, 2012 · ffa3fcf · ffa3fcf
1 parent 73e35ff
commit ffa3fcf
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: d291d5f692f3fe90de08cea3f1c14ebd80da89ce
+refs/heads/master: 795876238f127089d96f268e2639eb0f56ec1a91
diff --git a/trunk/drivers/iio/light/adjd_s311.c b/trunk/drivers/iio/light/adjd_s311.c
@@ -185,7 +185,7 @@ static irqreturn_t adjd_s311_trigger_handler(int irq, void *p)
 	}
 
 	if (indio_dev->scan_timestamp)
-		*(s64 *)((phys_addr_t)data->buffer + ALIGN(len, sizeof(s64)))
+		*(s64 *)((u8 *)data->buffer + ALIGN(len, sizeof(s64)))
 			= time_ns;
 	iio_push_to_buffer(buffer, (u8 *)data->buffer, time_ns);