On 22/05/16 07:28, Matt Ranostay wrote:
>
>> On May 21, 2016, at 20:01, Matt Ranostay <mranostay@xxxxxxxxx> wrote:
>>
>> Buffer wasn't of a valid size to allow the timestamp, and correct padding.
>> This patchset also moves the buffer off the stack, and onto the heap.
>>
>> Cc: george.mccollister@xxxxxxxxx
>> Signed-off-by: Matt Ranostay <mranostay@xxxxxxxxx>
Applied as per the other 2.
>> ---
>> drivers/iio/proximity/as3935.c | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
>> index 6aed024..8730451 100644
>> --- a/drivers/iio/proximity/as3935.c
>> +++ b/drivers/iio/proximity/as3935.c
>> @@ -64,6 +64,7 @@ struct as3935_state {
>> struct delayed_work work;
>>
>> u32 tune_cap;
>> + u8 buffer[16]; /* 8-bit data + 54-bit padding + 64-bit timestamp */
>
> Just noticed that should be noted as 56-bit
Fixed up.
>
>> u8 buf[2] ____cacheline_aligned;
>> };
>>
>> @@ -212,9 +213,10 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private)
>> ret = as3935_read(st, AS3935_DATA, &val);
>> if (ret)
>> goto err_read;
>> - val &= AS3935_DATA_MASK;
>>
>> - iio_push_to_buffers_with_timestamp(indio_dev, &val, pf->timestamp);
>> + st->buffer[0] = val & AS3935_DATA_MASK;
>> + iio_push_to_buffers_with_timestamp(indio_dev, &st->buffer,
>> + pf->timestamp);
>> err_read:
>> iio_trigger_notify_done(indio_dev->trig);
>>
>> --
>> 2.7.4
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
