Skip to content

Commit

Permalink
w1: w1 temp calculation overflow fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ian Dall authored and Linus Torvalds committed Feb 11, 2009
1 parent 4d48a54 commit 507e2fb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/w1/slaves/w1_therm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 507e2fb

Please sign in to comment.