projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
emc1403.c
diff --git
a/drivers/hwmon/emc1403.c
b/drivers/hwmon/emc1403.c
index 142e1cb8dea7e6ed641243588d525d6405d2124d..361f50b221bd0cb3ffb67d1ff6ab58a52f9c45e9 100644
(file)
--- a/
drivers/hwmon/emc1403.c
+++ b/
drivers/hwmon/emc1403.c
@@
-162,7
+162,7
@@
static ssize_t store_hyst(struct device *dev,
if (retval < 0)
goto fail;
if (retval < 0)
goto fail;
- hyst =
val - retval * 1000
;
+ hyst =
retval * 1000 - val
;
hyst = DIV_ROUND_CLOSEST(hyst, 1000);
if (hyst < 0 || hyst > 255) {
retval = -ERANGE;
hyst = DIV_ROUND_CLOSEST(hyst, 1000);
if (hyst < 0 || hyst > 255) {
retval = -ERANGE;
@@
-295,7
+295,7
@@
static int emc1403_detect(struct i2c_client *client,
}
id = i2c_smbus_read_byte_data(client, THERMAL_REVISION_REG);
}
id = i2c_smbus_read_byte_data(client, THERMAL_REVISION_REG);
- if (id
!= 0x01
)
+ if (id
< 0x01 || id > 0x04
)
return -ENODEV;
return 0;
return -ENODEV;
return 0;