projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'char-misc-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[cascardo/linux.git]
/
drivers
/
iio
/
chemical
/
atlas-ph-sensor.c
diff --git
a/drivers/iio/chemical/atlas-ph-sensor.c
b/drivers/iio/chemical/atlas-ph-sensor.c
index
bd321b3
..
ef761a5
100644
(file)
--- a/
drivers/iio/chemical/atlas-ph-sensor.c
+++ b/
drivers/iio/chemical/atlas-ph-sensor.c
@@
-213,13
+213,14
@@
static int atlas_check_ec_calibration(struct atlas_data *data)
struct device *dev = &data->client->dev;
int ret;
unsigned int val;
struct device *dev = &data->client->dev;
int ret;
unsigned int val;
+ __be16 rval;
- ret = regmap_bulk_read(data->regmap, ATLAS_REG_EC_PROBE, &val, 2);
+ ret = regmap_bulk_read(data->regmap, ATLAS_REG_EC_PROBE, &
r
val, 2);
if (ret)
return ret;
if (ret)
return ret;
- dev_info(dev, "probe set to K = %d.%.2d", be16_to_cpu(val) / 100,
-
be16_to_cpu(val)
% 100);
+ val = be16_to_cpu(rval);
+
dev_info(dev, "probe set to K = %d.%.2d", val / 100, val
% 100);
ret = regmap_read(data->regmap, ATLAS_REG_EC_CALIB_STATUS, &val);
if (ret)
ret = regmap_read(data->regmap, ATLAS_REG_EC_CALIB_STATUS, &val);
if (ret)