From ce66d2d1feaa01bb9f79036f6355390dbdfdfe73 Mon Sep 17 00:00:00 2001 From: Ian Dall Date: Fri, 23 Apr 2010 13:17:53 -0400 Subject: [PATCH] --- yaml --- r: 190195 b: refs/heads/master c: 9a6a1ecd9e9b5d046a236da2f7eb6b6812f04229 h: refs/heads/master i: 190193: fc252c19999fbcf37d3f823d806be177c90f175d 190191: a18ae87e48c36cf21abb282542b67496b3d9c1be v: v3 --- [refs] | 2 +- trunk/drivers/w1/slaves/w1_therm.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4985875ca529..53f8abf51e35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7716fa66034c408b0f59e8b9c62f793befa5b338 +refs/heads/master: 9a6a1ecd9e9b5d046a236da2f7eb6b6812f04229 diff --git a/trunk/drivers/w1/slaves/w1_therm.c b/trunk/drivers/w1/slaves/w1_therm.c index 1ed3d554e372..17726a05a0a6 100644 --- a/trunk/drivers/w1/slaves/w1_therm.c +++ b/trunk/drivers/w1/slaves/w1_therm.c @@ -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])