git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-5.4/apple' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
iio
/
adc
/
max9611.c
diff --git
a/drivers/iio/adc/max9611.c
b/drivers/iio/adc/max9611.c
index 0e3c6529fc4c99e4fc30f27e33987254db476e07..da073d72f649f829997f6f3ca9a43c13399aba0d 100644
(file)
--- 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) ||