aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hwmon/dme1737.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index 9635fa6014fc..b36290048b98 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -2360,13 +2360,16 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)
2360 client->addr = res->start; 2360 client->addr = res->start;
2361 platform_set_drvdata(pdev, data); 2361 platform_set_drvdata(pdev, data);
2362 2362
2363 company = dme1737_read(client, DME1737_REG_COMPANY); 2363 /* Skip chip detection if module is loaded with force_id parameter */
2364 device = dme1737_read(client, DME1737_REG_DEVICE); 2364 if (!force_id) {
2365 company = dme1737_read(client, DME1737_REG_COMPANY);
2366 device = dme1737_read(client, DME1737_REG_DEVICE);
2365 2367
2366 if (!((company == DME1737_COMPANY_SMSC) && 2368 if (!((company == DME1737_COMPANY_SMSC) &&
2367 (device == SCH311X_DEVICE))) { 2369 (device == SCH311X_DEVICE))) {
2368 err = -ENODEV; 2370 err = -ENODEV;
2369 goto exit_kfree; 2371 goto exit_kfree;
2372 }
2370 } 2373 }
2371 data->type = -1; 2374 data->type = -1;
2372 2375