From 14c29e09f5fe676c74d2aa86068978cf235cea4a Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 18 Jan 2007 22:14:23 +0100
Subject: [PATCH] --- yaml --- r: 45524 b: refs/heads/master c:
 9fab2d8b75a4084e91f1dcb4e55368406fe53010 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6a8c6dfa3fec..d23997edf044 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddca933bd554b4f81f27776f3cb9daa67cf241b1
+refs/heads/master: 9fab2d8b75a4084e91f1dcb4e55368406fe53010
diff --git a/trunk/drivers/hwmon/hwmon-vid.c b/trunk/drivers/hwmon/hwmon-vid.c
index 31c42002708f..b80f6ed5acfc 100644
--- a/trunk/drivers/hwmon/hwmon-vid.c
+++ b/trunk/drivers/hwmon/hwmon-vid.c
@@ -93,7 +93,7 @@ int vid_from_reg(int val, u8 vrm)
 	case 110:		/* Intel Conroe */
 				/* compute in uV, round to mV */
 		val &= 0xff;
-		if(((val & 0x7e) == 0xfe) || (!(val & 0x7e)))
+		if (val < 0x02 || val > 0xb2)
 			return 0;
 		return((1600000 - (val - 2) * 6250 + 500) / 1000);
 	case 24:                /* Opteron processor */