Merge 4.8-rc5 into staging-next

[linux-beck.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 84fbff32b96d04eb90ba53d11573282e72911bd3..bd321b305a0a03a38d2a26ec282eb22e7f37d5b6 100644 (file)
--- a/drivers/iio/chemical/atlas-ph-sensor.c
+++ b/drivers/iio/chemical/atlas-ph-sensor.c
@@ -461,7 +461,7 @@ static int atlas_read_raw(struct iio_dev *indio_dev,
                        break;
                case IIO_ELECTRICALCONDUCTIVITY:
                        *val = 1; /* 0.00001 */
-                       *val = 100000;
+                       *val2 = 100000;
                        break;
                case IIO_CONCENTRATION:
                        *val = 0; /* 0.000000001 */