From 6c5945eb9eb880bcb8607ab6b192368aa84fc5eb Mon Sep 17 00:00:00 2001
From: David Fries <david@fries.net>
Date: Wed, 6 Feb 2008 01:38:09 -0800
Subject: [PATCH] --- yaml --- r: 83487 b: refs/heads/master c:
 7129b126cc64f530d793bd56eb1709a06ec65a2d h: refs/heads/master i:   83485:
 f61b85832f67221d1ab86eadb3972347b3231c80   83483:
 b8d965083bcc116c53393ea1dd767b15c5073253   83479:
 ee3f81faf899409c5a680b90fe9d4e09c2249473   83471:
 c9cb9c3c32f4b8f3bcdda5fddc4afef72c4e2fc2   83455:
 f3ddd4272cb8a8f272480b586747afcd74a93611 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/w1/slaves/w1_therm.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 44a1fa0d79bd..80a566378a08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35841f708070bd295a96f6c98e566f8b251c1b48
+refs/heads/master: 7129b126cc64f530d793bd56eb1709a06ec65a2d
diff --git a/trunk/drivers/w1/slaves/w1_therm.c b/trunk/drivers/w1/slaves/w1_therm.c
index 112f4ec59035..fb28acaeed6c 100644
--- a/trunk/drivers/w1/slaves/w1_therm.c
+++ b/trunk/drivers/w1/slaves/w1_therm.c
@@ -92,6 +92,7 @@ struct w1_therm_family_converter
 	int			(*convert)(u8 rom[9]);
 };
 
+/* The return value is millidegrees Centigrade. */
 static inline int w1_DS18B20_convert_temp(u8 rom[9]);
 static inline int w1_DS18S20_convert_temp(u8 rom[9]);
 
@@ -113,7 +114,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];
-	t /= 16;
+	t = t*1000/16;
 	return t;
 }