hwmon: (dme1737) Skip detection if forced

Skip the checking of the device ID register in the hwmon register
block if the force_id option is used.

Signed-off-by: Juerg Haefliger <juergh@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index 9635fa6014fcc624f8ee812bd6b33f90d3efe1d5..b36290048b982c00ec38c68cb6ff1c053dcf742c 100644 (file)
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -2360,13 +2360,16 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)
        client->addr = res->start;
        platform_set_drvdata(pdev, data);
 
-       company = dme1737_read(client, DME1737_REG_COMPANY);
-       device = dme1737_read(client, DME1737_REG_DEVICE);
+       /* Skip chip detection if module is loaded with force_id parameter */
+       if (!force_id) {
+               company = dme1737_read(client, DME1737_REG_COMPANY);
+               device = dme1737_read(client, DME1737_REG_DEVICE);
 
-       if (!((company == DME1737_COMPANY_SMSC) &&
-             (device == SCH311X_DEVICE))) {
-               err = -ENODEV;
-               goto exit_kfree;
+               if (!((company == DME1737_COMPANY_SMSC) &&
+                     (device == SCH311X_DEVICE))) {
+                       err = -ENODEV;
+                       goto exit_kfree;
+               }
        }
        data->type = -1;