diff mbox

[Xenial,SRU] UBUNTU:SAUCE: iio: common: st_sensors: fix channel data parsing

Message ID 20161215102344.2465-1-shrirang.bagul@canonical.com
State New
Headers show

Commit Message

Shrirang Bagul Dec. 15, 2016, 10:23 a.m. UTC 
From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>

BugLink: http://bugs.launchpad.net/bugs/1650189

Using realbits as i2c/spi read len, when that value is not byte aligned
(e.g 12 bits), lead to skip msb part of out data registers.
Fix this taking into account scan_type.shift in addition to
scan_type.realbits as read length:

read_len = DIV_ROUND_UP(realbits + shift, 8)

This fix has been tested on 8, 12, 16, 24 bit sensors

Fixes: e7385de5291e ("iio:st_sensors: align on storagebits boundaries")
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
(backported from commit fd60b8949f4e85be2b9f364ab9c898c408664518)
(source: git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git)
Signed-off-by: Shrirang Bagul <shrirang.bagul@canonical.com>
---
 drivers/iio/common/st_sensors/st_sensors_buffer.c | 3 ++-
 drivers/iio/common/st_sensors/st_sensors_core.c   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

Comments

Tim Gardner Dec. 15, 2016, 2:38 p.m. UTC | #1 
Resend when this patch has at least made it into linux-next.
Tim Gardner Dec. 19, 2016, 6:20 p.m. UTC | #2 
On 12/15/2016 07:38 AM, Tim Gardner wrote:
> Resend when this patch has at least made it into linux-next.
> 

OK, this patch is pretty low consequence.
Luis Henriques Dec. 19, 2016, 6:56 p.m. UTC | #3 
Applied to xenial master-next branch.

Cheers,
--
Luís
diff mbox

Patch

diff --git a/drivers/iio/common/st_sensors/st_sensors_buffer.c b/drivers/iio/common/st_sensors/st_sensors_buffer.c
index e18bc67..362e15f 100644
--- a/drivers/iio/common/st_sensors/st_sensors_buffer.c
+++ b/drivers/iio/common/st_sensors/st_sensors_buffer.c
@@ -29,7 +29,8 @@  int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf)
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 	unsigned int num_data_channels = sdata->num_data_channels;
 	unsigned int byte_for_channel =
-			indio_dev->channels[0].scan_type.storagebits >> 3;
+		DIV_ROUND_UP(indio_dev->channels[0].scan_type.realbits +
+				indio_dev->channels[0].scan_type.shift, 8);
 
 	addr = kmalloc(num_data_channels, GFP_KERNEL);
 	if (!addr) {
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 25258e2..1c2a313 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -444,8 +444,10 @@  static int st_sensors_read_axis_data(struct iio_dev *indio_dev,
 	int err;
 	u8 *outdata;
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
-	unsigned int byte_for_channel = ch->scan_type.storagebits >> 3;
+	unsigned int byte_for_channel;
 
+	byte_for_channel = DIV_ROUND_UP(ch->scan_type.realbits +
+					ch->scan_type.shift, 8);
 	outdata = kmalloc(byte_for_channel, GFP_KERNEL);
 	if (!outdata)
 		return -ENOMEM;