git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwmon: (max1111) Return -ENODEV from max1111_read_channel if not instantiated
[pandora-kernel.git]
/
drivers
/
hwmon
/
sis5595.c
diff --git
a/drivers/hwmon/sis5595.c
b/drivers/hwmon/sis5595.c
index
47d7ce9
..
029a2e1
100644
(file)
--- a/
drivers/hwmon/sis5595.c
+++ b/
drivers/hwmon/sis5595.c
@@
-133,6
+133,8
@@
static inline u8 FAN_TO_REG(long rpm, int div)
{
if (rpm <= 0)
return 255;
{
if (rpm <= 0)
return 255;
+ if (rpm > 1350000)
+ return 1;
return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
}
return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
}
@@
-147,7
+149,7
@@
static inline int TEMP_FROM_REG(s8 val)
{
return val * 830 + 52120;
}
{
return val * 830 + 52120;
}
-static inline s8 TEMP_TO_REG(
int
val)
+static inline s8 TEMP_TO_REG(
long
val)
{
int nval = SENSORS_LIMIT(val, -54120, 157530) ;
return nval<0 ? (nval-5212-415)/830 : (nval-5212+415)/830;
{
int nval = SENSORS_LIMIT(val, -54120, 157530) ;
return nval<0 ? (nval-5212-415)/830 : (nval-5212+415)/830;