Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 507e2fba authored by Ian Dall's avatar Ian Dall Committed by Linus Torvalds
Browse files

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: default avatarIan Dall <ian@beware.dropbear.id.au>
Signed-off-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4d48a542

drivers/w1/slaves/w1_therm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}