Commit 01b9cb0d authored by Daniel Campello's avatar Daniel Campello Committed by Jonathan Cameron
Browse files

iio: sx9310: Fixes various memory handling 



Makes use __aligned(8) to ensure that the timestamp is correctly aligned
when we call io_push_to_buffers_with_timestamp().
Also makes use of sizeof() for regmap_bulk_read instead of static value.

Signed-off-by: default avatarDaniel Campello <campello@chromium.org>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 9b2cac94

drivers/iio/proximity/sx9310.c

+8 −5
Original line number Diff line number Diff line
@@ -132,8 +132,11 @@ struct sx9310_data { 
	 */

	bool prox_stat[SX9310_NUM_CHANNELS];

	bool trigger_enabled;

	__be16 buffer[SX9310_NUM_CHANNELS +

		      4]; /* 64-bit data + 64-bit timestamp */

	/* Ensure correct alignment of timestamp when present. */

	struct {

		__be16 channels[SX9310_NUM_CHANNELS];

		s64 ts __aligned(8);

	} buffer;

	/* Remember enabled channels and sample rate during suspend. */

	unsigned int suspend_ctrl0;

	struct completion completion;
@@ -344,7 +347,7 @@ static int sx9310_read_prox_data(struct sx9310_data *data, 
	if (ret < 0)

		return ret;



	return regmap_bulk_read(data->regmap, chan->address, val, 2);

	return regmap_bulk_read(data->regmap, chan->address, val, sizeof(*val));

}



/*
@@ -694,10 +697,10 @@ static irqreturn_t sx9310_trigger_handler(int irq, void *private) 
		if (ret < 0)

			goto out;



		data->buffer[i++] = val;

		data->buffer.channels[i++] = val;

	}



	iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,

	iio_push_to_buffers_with_timestamp(indio_dev, &data->buffer,

					   pf->timestamp);



out:

CRA Git | Maintained and supported by SUSTech CRA and CCSE