Commit 55d68d75 authored by Juerg Haefliger's avatar Juerg Haefliger Committed by Jean Delvare

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: default avatarJuerg Haefliger <juergh@gmail.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 73ce48f6
...@@ -2360,13 +2360,16 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev) ...@@ -2360,13 +2360,16 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)
client->addr = res->start; client->addr = res->start;
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);
company = dme1737_read(client, DME1737_REG_COMPANY); /* Skip chip detection if module is loaded with force_id parameter */
device = dme1737_read(client, DME1737_REG_DEVICE); if (!force_id) {
company = dme1737_read(client, DME1737_REG_COMPANY);
device = dme1737_read(client, DME1737_REG_DEVICE);
if (!((company == DME1737_COMPANY_SMSC) && if (!((company == DME1737_COMPANY_SMSC) &&
(device == SCH311X_DEVICE))) { (device == SCH311X_DEVICE))) {
err = -ENODEV; err = -ENODEV;
goto exit_kfree; goto exit_kfree;
}
} }
data->type = -1; data->type = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment