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 'mac80211-for-davem-2016-09-13' of git://git.kernel.org/pub/scm/linux/kerne...
[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
ae038a5
..
407f141
100644
(file)
--- a/
drivers/iio/chemical/atlas-ph-sensor.c
+++ b/
drivers/iio/chemical/atlas-ph-sensor.c
@@
-434,7
+434,7
@@
static int atlas_read_raw(struct iio_dev *indio_dev,
break;
case IIO_ELECTRICALCONDUCTIVITY:
*val = 1; /* 0.00001 */
- *val = 100000;
+ *val
2
= 100000;
break;
case IIO_CONCENTRATION:
*val = 0; /* 0.000000001 */