diff options
| author | Juerg Haefliger <juergh@gmail.com> | 2008-08-06 16:41:03 -0400 |
|---|---|---|
| committer | Jean Delvare <khali@mahadeva.delvare> | 2008-08-06 16:41:03 -0400 |
| commit | 55d68d75ab00e60953f8784af5927b60967a297f (patch) | |
| tree | 0bca79817ca9f92ad557eaab17daba8359468ff1 /drivers | |
| parent | 73ce48f6c6b9d9dcf6a2bba0bcde39ede76809f0 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/dme1737.c | 15 |
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 | ||