Changeset 3204

Timestamp:

12/09/05 20:29:01 (7 years ago)

Author:

khali

Message:

Display VID as 0V for W83627THF when GPIO5 is not used as VID
inputs. Backport of Yuan Mu's patch for Linux 2.6.

Files:

• lm-sensors/trunk/kernel/chips/w83627hf.c (modified) (3 diffs)

lm-sensors/trunk/kernel/chips/w83627hf.c

@@ -818 +818 @@
         /* Make sure the pins are configured for input
            There must be at least five (VRM 9), and possibly 6 (VRM 10) */
-        sel = superio_inb(W83627THF_GPIO5_IOSR);
+        sel = superio_inb(W83627THF_GPIO5_IOSR) & 0x3f;
         if ((sel & 0x1f) != 0x1f) {
 #ifdef DEBUG
@@ -888 +888 @@
                 data->vid = (lo & 0x0f) | ((hi & 0x01) << 4);
         } else if (w83627thf == data->type) {
-                data->vid = w83627thf_read_gpio5(client) & 0x3f;
+                data->vid = w83627thf_read_gpio5(client);
         }
 
@@ -1185 +1185 @@
                 *nrels_mag = 3;
         else if (operation == SENSORS_PROC_REAL_READ) {
-                w83627hf_update_client(client);
-                results[0] = vid_from_reg(data->vid, data->vrm);
+                if (data->vid == 0xff)
+                        results[0] = 0;
+                else
+                        results[0] = vid_from_reg(data->vid, data->vrm);
                 *nrels_mag = 1;
         }