mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-28 03:40:04 +00:00
Code Issues Releases Wiki Activity

iio: hudmidity: hdc100x: fix incorrect shifting and scaling

Browse source 
Shifting sensor data to the right 2 bits was incorrect and caused the
scaling values + offsets to be invalid.

Reported-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
Tested-by: Alison Schofield <amsfield22@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Matt Ranostay 2016-05-29 19:52:02 -07:00 committed by Jonathan Cameron
parent 590b92a302
commit 94bef000f1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/iio/humidity/hdc100x.c
View file

@ -164,14 +164,14 @@ static int hdc100x_get_measurement(struct hdc100x_data *data,
dev_err(&client->dev, "cannot read high byte measurement"); dev_err(&client->dev, "cannot read high byte measurement");
return ret; return ret;
} }
val = ret << 6; val = ret << 8;
ret = i2c_smbus_read_byte(client); ret = i2c_smbus_read_byte(client);
if (ret < 0) { if (ret < 0) {
dev_err(&client->dev, "cannot read low byte measurement"); dev_err(&client->dev, "cannot read low byte measurement");
return ret; return ret;
} }
val |= ret >> 2; val |= ret;
return val; return val;
} }
@ -212,17 +212,17 @@ static int hdc100x_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_SCALE: case IIO_CHAN_INFO_SCALE:
if (chan->type == IIO_TEMP) { if (chan->type == IIO_TEMP) {
*val = 165000; *val = 165000;
*val2 = 65536 >> 2; *val2 = 65536;
return IIO_VAL_FRACTIONAL; return IIO_VAL_FRACTIONAL;
} else { } else {
*val = 0; *val = 100;
*val2 = 10000; *val2 = 65536;
return IIO_VAL_INT_PLUS_MICRO; return IIO_VAL_FRACTIONAL;
} }
break; break;
case IIO_CHAN_INFO_OFFSET: case IIO_CHAN_INFO_OFFSET:
*val = -3971; *val = -15887;
*val2 = 879096; *val2 = 515151;
return IIO_VAL_INT_PLUS_MICRO; return IIO_VAL_INT_PLUS_MICRO;
default: default:
return -EINVAL; return -EINVAL;