Commit:     7129b126cc64f530d793bd56eb1709a06ec65a2d
Parent:     35841f708070bd295a96f6c98e566f8b251c1b48
Author:     David Fries <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 6 01:38:09 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Feb 6 10:41:10 2008 -0800

    W1: w1_therm.c standardize units to millidegrees C
    Standardize the temperature units to millidegrees C for the two sensor
    conversion routines.  Previously the routines were,
    w1_DS18B20_convert_temp degrees C
    w1_DS18S20_convert_temp millidegrees C
    Unfortunately this will break any program using the ds18b20 value as it
    will now be 1000 times bigger.  Fortunately there can't be that many users
    out there, or some of these bugs will have been fixed by now, such as the
    negative C error (see previous patch) that makes me think the ds18b20 is
    the better choice to change because of the current bugs.
    Signed-off-by: David Fries <[EMAIL PROTECTED]>
    Cc: Evgeniy Polyakov <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/w1/slaves/w1_therm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 112f4ec..fb28aca 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to