diff --git a/[refs] b/[refs]
index dc5b2bc5f3c4..8bb8f6a6d702 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 795876238f127089d96f268e2639eb0f56ec1a91
+refs/heads/master: be344c84c2d805378f410929b2eb0a538b4206e2
diff --git a/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c b/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c
index c0951f9f8a2f..bd628de472a9 100644
--- a/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c
+++ b/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -85,7 +85,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
 	}
 	/* Store the timestamp at an 8 byte aligned offset */
 	if (indio_dev->scan_timestamp)
-		*(s64 *)((phys_addr_t)data + ALIGN(len, sizeof(s64)))
+		*(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
 			= iio_get_time_ns();
 	buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);