From 6fb6bb0b63736819373e53bafa6c7522067fcaba Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Fri, 5 Mar 2010 22:17:25 +0100
Subject: [PATCH] --- yaml --- r: 186417 b: refs/heads/master c:
 a44908d742a577fb5ccb9a8c082326d4cea234c2 h: refs/heads/master i:   186415:
 6c4a10d56b0e217b70eb50f35fe7ba60754be959 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/hwmon/tmp421.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7b0875d93683..7daa583f4d63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d59582a867470a3e0c3eced4a01625ae8dc546b
+refs/heads/master: a44908d742a577fb5ccb9a8c082326d4cea234c2
diff --git a/trunk/drivers/hwmon/tmp421.c b/trunk/drivers/hwmon/tmp421.c
index a97e299b233b..bb9760d7e8b6 100644
--- a/trunk/drivers/hwmon/tmp421.c
+++ b/trunk/drivers/hwmon/tmp421.c
@@ -80,14 +80,16 @@ struct tmp421_data {
 
 static int temp_from_s16(s16 reg)
 {
-	int temp = reg;
+	/* Mask out status bits */
+	int temp = reg & ~0xf;
 
 	return (temp * 1000 + 128) / 256;
 }
 
 static int temp_from_u16(u16 reg)
 {
-	int temp = reg;
+	/* Mask out status bits */
+	int temp = reg & ~0xf;
 
 	/* Add offset for extended temperature range. */
 	temp -= 64 * 256;