diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
commit | 56b4811039174bba9cbd68318d0d8b1585b9eded (patch) | |
tree | f3e8f99e85e545662d82e18bef2a7009c2948852 /drivers/hwmon/vt8231.c | |
parent | e777b63bbd589248eb151a3191ee92331a701385 (diff) | |
parent | 9722c2dac708e9468cc0dc30218ef76946ffbc9d (diff) | |
download | op-kernel-dev-56b4811039174bba9cbd68318d0d8b1585b9eded.zip op-kernel-dev-56b4811039174bba9cbd68318d0d8b1585b9eded.tar.gz |
Merge branch 'sched/urgent' into sched/core
Pick up the latest fixes before applying new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/hwmon/vt8231.c')
-rw-r--r-- | drivers/hwmon/vt8231.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c index 0e70178..aee14e2 100644 --- a/drivers/hwmon/vt8231.c +++ b/drivers/hwmon/vt8231.c @@ -145,7 +145,7 @@ static const u8 regtempmin[] = { 0x3a, 0x3e, 0x2c, 0x2e, 0x30, 0x32 }; */ static inline u8 FAN_TO_REG(long rpm, int div) { - if (rpm == 0) + if (rpm <= 0 || rpm > 1310720) return 0; return clamp_val(1310720 / (rpm * div), 1, 255); } |