From 5b12d06dc7235cf20895d0666b15d6b069624efe Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Sat, 14 Jul 2012 17:23:00 +0100 Subject: [PATCH] --- yaml --- r: 318027 b: refs/heads/master c: be344c84c2d805378f410929b2eb0a538b4206e2 h: refs/heads/master i: 318025: 73e35fff4b022f0de8c0715b954949e0cfd79f5e 318023: c17bc2dd3a0b0e031a2c359e2bdc7c4038586af6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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);