---

yaml --- r: 190195 b: refs/heads/master c: 9a6a1ec h: refs/heads/master i: 190193: fc252c1 190191: a18ae87 v: v3
git-mirror · Apr 24, 2010 · ce66d2d · ce66d2d
1 parent 598db59
commit ce66d2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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])