summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2010-10-28 20:31:46 +0200
committerJean Delvare <khali@endymion.delvare>2010-10-28 20:31:46 +0200
commit6c82b2f3fb31e43a9b898769afd2151ca64986a4 (patch)
tree1315014b74cc4ea9cea40c7fc8bf60f7826cca3d /drivers
parent71caf46fbf39207a324a16ddb6d8ef37c05777b9 (diff)
downloadop-kernel-dev-6c82b2f3fb31e43a9b898769afd2151ca64986a4.zip
op-kernel-dev-6c82b2f3fb31e43a9b898769afd2151ca64986a4.tar.gz
hwmon: (w83795) Fix LSB reading of fan speeds
Misplaced parentheses caused the wrong register value to be read, resulting in random LSB for fan speed values and limits. Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/w83795.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c
index b797b9c..24e4424 100644
--- a/drivers/hwmon/w83795.c
+++ b/drivers/hwmon/w83795.c
@@ -272,7 +272,7 @@ static inline u16 in_to_reg(u8 index, u16 val)
static inline unsigned long fan_from_reg(u16 val)
{
- if ((val >= 0xff0) || (val == 0))
+ if ((val == 0xfff) || (val == 0))
return 0;
return 1350000UL / val;
}
@@ -456,7 +456,7 @@ static struct w83795_data *w83795_update_device(struct device *dev)
continue;
data->fan[i] = w83795_read(client, W83795_REG_FAN(i)) << 4;
data->fan[i] |=
- (w83795_read(client, W83795_REG_VRLSB >> 4)) & 0x0F;
+ (w83795_read(client, W83795_REG_VRLSB) >> 4) & 0x0F;
}
/* Update temperature */
@@ -1940,11 +1940,11 @@ static int w83795_probe(struct i2c_client *client,
data->fan_min[i] =
w83795_read(client, W83795_REG_FAN_MIN_HL(i)) << 4;
data->fan_min[i] |=
- (w83795_read(client, W83795_REG_FAN_MIN_LSB(i) >>
- W83795_REG_FAN_MIN_LSB_SHIFT(i))) & 0x0F;
+ (w83795_read(client, W83795_REG_FAN_MIN_LSB(i)) >>
+ W83795_REG_FAN_MIN_LSB_SHIFT(i)) & 0x0F;
data->fan[i] = w83795_read(client, W83795_REG_FAN(i)) << 4;
data->fan[i] |=
- (w83795_read(client, W83795_REG_VRLSB >> 4)) & 0x0F;
+ (w83795_read(client, W83795_REG_VRLSB) >> 4) & 0x0F;
}
/* temperature and limits */
OpenPOWER on IntegriCloud