mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 06:31:52 +00:00
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>
This commit is contained in:
parent
4d48a542b4
commit
507e2fbaaa
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user