Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
iio
/
humidity
/
hdc100x.c
diff --git
a/kernel/drivers/iio/humidity/hdc100x.c
b/kernel/drivers/iio/humidity/hdc100x.c
index
a7f61e8
..
dc5e7e7
100644
(file)
--- a/
kernel/drivers/iio/humidity/hdc100x.c
+++ b/
kernel/drivers/iio/humidity/hdc100x.c
@@
-55,7
+55,7
@@
static const struct {
},
{ /* IIO_HUMIDITYRELATIVE channel */
.shift = 8,
},
{ /* IIO_HUMIDITYRELATIVE channel */
.shift = 8,
- .mask =
2
,
+ .mask =
3
,
},
};
},
};
@@
-164,14
+164,14
@@
static int hdc100x_get_measurement(struct hdc100x_data *data,
dev_err(&client->dev, "cannot read high byte measurement");
return ret;
}
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;
}
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;
}
return val;
}
@@
-211,18
+211,18
@@
static int hdc100x_read_raw(struct iio_dev *indio_dev,
return IIO_VAL_INT_PLUS_MICRO;
case IIO_CHAN_INFO_SCALE:
if (chan->type == IIO_TEMP) {
return IIO_VAL_INT_PLUS_MICRO;
case IIO_CHAN_INFO_SCALE:
if (chan->type == IIO_TEMP) {
- *val = 165;
- *val2 = 65536
>> 2
;
+ *val = 165
000
;
+ *val2 = 65536;
return IIO_VAL_FRACTIONAL;
} else {
return IIO_VAL_FRACTIONAL;
} else {
- *val = 0;
- *val2 =
10000
;
- return IIO_VAL_
INT_PLUS_MICRO
;
+ *val =
10
0;
+ *val2 =
65536
;
+ return IIO_VAL_
FRACTIONAL
;
}
break;
case IIO_CHAN_INFO_OFFSET:
}
break;
case IIO_CHAN_INFO_OFFSET:
- *val = -
3971
;
- *val2 =
879096
;
+ *val = -
15887
;
+ *val2 =
515151
;
return IIO_VAL_INT_PLUS_MICRO;
default:
return -EINVAL;
return IIO_VAL_INT_PLUS_MICRO;
default:
return -EINVAL;