---

yaml --- r: 131298 b: refs/heads/master c: 507e2fb h: refs/heads/master v: v3
git-mirror · Feb 11, 2009 · 325dff9 · 325dff9
1 parent 73007fc
commit 325dff9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d48a542b42747c36a5937447d9c3de7c897ea50
+refs/heads/master: 507e2fbaaacb6f164b4125b87c5002f95143174b
diff --git a/trunk/drivers/w1/slaves/w1_therm.c b/trunk/drivers/w1/slaves/w1_therm.c
@@ -115,7 +115,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];
+	int t = ((s16)rom[1] << 8) | rom[0];
 	t = t*1000/16;
 	return t;
 }