diff options
| author | Ian Dall <ian@beware.dropbear.id.au> | 2009-02-11 13:04:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 14:25:37 -0800 |
| commit | 507e2fbaaacb6f164b4125b87c5002f95143174b (patch) | |
| tree | 6407941a4dfecbd71e6222f2d640f3c5ed2715d0 /drivers | |
| parent | 4d48a542b42747c36a5937447d9c3de7c897ea50 (diff) | |
| download | op-kernel-dev-507e2fbaaacb6f164b4125b87c5002f95143174b.zip op-kernel-dev-507e2fbaaacb6f164b4125b87c5002f95143174b.tar.gz | |
w1: w1 temp calculation overflow fix
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=12646
When the temperature exceeds 32767 milli-degrees the temperature overflows
to -32768 millidegrees. These are bothe well within the -55 - +125 degree
range for the sensor.
Fix overflow in left-shift of a u8.
Signed-off-by: Ian Dall <ian@beware.dropbear.id.au>
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/w1/slaves/w1_therm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 2c8dff9..1ed3d55 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -115,7 +115,7 @@ static struct w1_therm_family_converter w1_therm_families[] = { static inline int w1_DS18B20_convert_temp(u8 rom[9]) { - s16 t = (rom[1] << 8) | rom[0]; + int t = ((s16)rom[1] << 8) | rom[0]; t = t*1000/16; return t; } |
