Skip to content

Commit

Permalink
w1: w1 temp: fix negative termperature calculation
Browse files Browse the repository at this point in the history
Fix regression caused by commit 507e2fb
("w1: w1 temp calculation overflow fix") whereby negative temperatures for
the DS18B20 are not converted properly.

When the temperature exceeds 32767 milli-degrees the temperature overflows
to -32768 millidegrees.  These are both well within the -55 - +125 degree
range for the sensor.

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=12646

Signed-of-by: Ian Dall <ian@beware.dropbear.id.au>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Tested-by: Karsten Elfenbein <kelfe@gmx.de>
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 Apr 24, 2010
1 parent 7716fa6 commit 9a6a1ec
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/w1/slaves/w1_therm.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,8 @@ static struct w1_therm_family_converter w1_therm_families[] = {

static inline int w1_DS18B20_convert_temp(u8 rom[9])
{
int t = ((s16)rom[1] << 8) | rom[0];
t = t*1000/16;
return t;
s16 t = le16_to_cpup((__le16 *)rom);
return t*1000/16;
}

static inline int w1_DS18S20_convert_temp(u8 rom[9])
Expand Down

0 comments on commit 9a6a1ec

Please sign in to comment.