From 20dbe9f926a54995b5f75c1231af94365b968ca1 Mon Sep 17 00:00:00 2001
From: David Fries <david@fries.net>
Date: Tue, 22 Jan 2008 03:31:37 -0800
Subject: [PATCH] --- yaml --- r: 75628 b: refs/heads/master c:
 941ed3b53086697eac7449f3ab5d2c5ab3259de2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dd8e9618e0ab..14b25aa888cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d384e35a25445bb60457b7dab8cffe178c6b7ecb
+refs/heads/master: 941ed3b53086697eac7449f3ab5d2c5ab3259de2
diff --git a/trunk/drivers/w1/slaves/w1_therm.c b/trunk/drivers/w1/slaves/w1_therm.c
index 4318935678c5..feed89e733e4 100644
--- a/trunk/drivers/w1/slaves/w1_therm.c
+++ b/trunk/drivers/w1/slaves/w1_therm.c
@@ -112,7 +112,7 @@ static struct w1_therm_family_converter w1_therm_families[] = {
 
 static inline int w1_DS18B20_convert_temp(u8 rom[9])
 {
-	int t = (rom[1] << 8) | rom[0];
+	s16 t = (rom[1] << 8) | rom[0];
 	t /= 16;
 	return t;
 }