diff options
| author | Greg Kroah-Hartman | 2019-08-19 07:13:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-08-19 07:13:42 +0200 |
| commit | c6d6832ce3980a25d2dcbb4ee6758fa9e0653500 (patch) | |
| tree | 1ee26bd20b773d59f361598267984292e2e70c3b /drivers/iio/adc | |
| parent | 87b42aa3cb5512036ca98028c6f6b914a96743ba (diff) | |
| parent | d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 (diff) | |
Merge 5.3-rc5 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/adc')
| -rw-r--r-- | drivers/iio/adc/max9611.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c index 0e3c6529fc4c..da073d72f649 100644 --- a/drivers/iio/adc/max9611.c +++ b/drivers/iio/adc/max9611.c @@ -480,7 +480,7 @@ static int max9611_init(struct max9611_dev *max9611) if (ret) return ret; - regval = ret & MAX9611_TEMP_MASK; + regval &= MAX9611_TEMP_MASK; if ((regval > MAX9611_TEMP_MAX_POS && regval < MAX9611_TEMP_MIN_NEG) || |