diff --git a/[refs] b/[refs]
index 8bb8f6a6d702..ab3cee64f960 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be344c84c2d805378f410929b2eb0a538b4206e2
+refs/heads/master: dcbc3c414e62faa4e1a1e17421f89eceea6bee30
diff --git a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c
index d7f8af7678fd..18d108fd967a 100644
--- a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -151,8 +151,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
 
 	  /* Guaranteed to be aligned with 8 byte boundary */
 	if (indio_dev->scan_timestamp)
-		*(s64 *)(((phys_addr_t)data + len
-				+ sizeof(s64) - 1) & ~(sizeof(s64) - 1))
+		*(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
 			= pf->timestamp;
 	buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);