Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (59 commits)
  hwmon: (lm80) Add individual alarm files
  hwmon: (lm80) De-macro the sysfs callbacks
  hwmon: (lm80) Various cleanups
  hwmon: (w83627hf) Refactor beep enable handling
  hwmon: (w83627hf) Add individual alarm and beep files
  hwmon: (w83627hf) Enable VBAT monitoring
  hwmon: (w83627ehf) The W83627DHG has 8 VID pins
  hwmon: (asb100) Add individual alarm files
  hwmon: (asb100) De-macro the sysfs callbacks
  hwmon: (asb100) Various cleanups
  hwmon: VRM is not written to registers
  hwmon: (dme1737) fix Super-IO device ID override
  hwmon: (dme1737) fix divide-by-0
  hwmon: (abituguru3) Add AUX4 fan input for Abit IP35 Pro
  hwmon: Add support for Texas Instruments/Burr-Brown ADS7828
  hwmon: (adm9240) Add individual alarm files
  hwmon: (lm77) Add individual alarm files
  hwmon: Discard useless I2C driver IDs
  hwmon: (lm85) Make the pwmN_enable files writable
  hwmon: (lm85) Return standard values in pwmN_enable
  ...

1 files changed, 17 insertions, 6 deletions

diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index a878c98e252e..ddddd9f34c19 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -44,6 +44,10 @@ static int force_start;
 module_param(force_start, bool, 0);
 MODULE_PARM_DESC(force_start, "Force the chip to start monitoring inputs");
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
 
@@ -279,14 +283,21 @@ static inline int TEMP_HYST_TO_REG(int val, int ix, int reg)
 /* Fan input RPM */
 static inline int FAN_FROM_REG(int reg, int tpc)
 {
-        return (reg == 0 || reg == 0xffff) ? 0 :
-                (tpc == 0) ? 90000 * 60 / reg : tpc * reg;
+        if (tpc) {
+                return tpc * reg;
+        } else {
+                return (reg == 0 || reg == 0xffff) ? 0 : 90000 * 60 / reg;
+        }
 }
 
 static inline int FAN_TO_REG(int val, int tpc)
 {
-        return SENSORS_LIMIT((tpc == 0) ? 90000 * 60 / val : val / tpc,
-                             0, 0xffff);
+        if (tpc) {
+                return SENSORS_LIMIT(val / tpc, 0, 0xffff);
+        } else {
+                return (val <= 0) ? 0xffff :
+                        SENSORS_LIMIT(90000 * 60 / val, 0, 0xfffe);
+        }
 }
 
 /* Fan TPC (tach pulse count)
@@ -2019,7 +2030,7 @@ static int dme1737_i2c_get_features(int sio_cip, struct dme1737_data *data)
 
         /* Check device ID
          * The DME1737 can return either 0x78 or 0x77 as its device ID. */
-        reg = dme1737_sio_inb(sio_cip, 0x20);
+        reg = force_id ? force_id : dme1737_sio_inb(sio_cip, 0x20);
         if (!(reg == 0x77 || reg == 0x78)) {
                 err = -ENODEV;
                 goto exit;
@@ -2191,7 +2202,7 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr)
         /* Check device ID
          * We currently know about SCH3112 (0x7c), SCH3114 (0x7d), and
          * SCH3116 (0x7f). */
-        reg = dme1737_sio_inb(sio_cip, 0x20);
+        reg = force_id ? force_id : dme1737_sio_inb(sio_cip, 0x20);
         if (!(reg == 0x7c || reg == 0x7d || reg == 0x7f)) {
                 err = -ENODEV;
                 goto exit;