patch "iio: hudmidity: hdc100x: fix incorrect shifting and scaling" added to staging-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
iio: hudmidity: hdc100x: fix incorrect shifting and scaling
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
94bef000f1d4aa111f4ddda1482cf3b30ad069ceMon Sep 17 00:00:00 2001
From: Matt Ranostay <[email protected]>
Date: Sun, 29 May 2016 19:52:02 -0700
Subject: iio: hudmidity: hdc100x: fix incorrect shifting and scaling
Shifting sensor data to the right 2 bits was incorrect and caused the scaling values + offsets to be invalid.
--- drivers/iio/humidity/hdc100x.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/iio/humidity/hdc100x.c +8 -8
@@ -164,14 +164,14 @@ static int hdc100x_get_measurement(struct hdc100x_data *data,dev_err (&client->dev,"cannot read high byte measurement" );return ret; } - val = ret <<6 ; + val = ret <<8 ; ret =i2c_smbus_read_byte (client);if (ret <0 ) {dev_err (&client->dev,"cannot read low byte measurement" );return ret; } - val |= ret >>2 ; + val |= ret;return val; }
@@ -212,17 +212,17 @@ static int hdc100x_read_raw(struct iio_dev *indio_dev,case IIO_CHAN_INFO_SCALE :if (chan->type ==IIO_TEMP ) { *val =165000 ; - *val2 =65536 >>2 ; + *val2 =65536 ;return IIO_VAL_FRACTIONAL ; }else { - *val =0 ; - *val2 =10000 ; -return IIO_VAL_INT_PLUS_MICRO ; + *val =100 ; + *val2 =65536 ; +return IIO_VAL_FRACTIONAL ; }break ;case IIO_CHAN_INFO_OFFSET : - *val =-3971 ; - *val2 =879096 ; + *val =-15887 ; + *val2 =515151 ;return IIO_VAL_INT_PLUS_MICRO ;default :return -EINVAL ;
Signature · 1 line
2.8.3