Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/hwmon/dme1737.c

+9 −6
Original line number Diff line number Diff line
@@ -2360,6 +2360,8 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev) 
	client->addr = res->start;

	platform_set_drvdata(pdev, data);



	/* 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);
@@ -2368,6 +2370,7 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev) 
			err = -ENODEV;

			goto exit_kfree;

		}

	}

	data->type = -1;



	/* Fill in the remaining client fields and initialize the mutex */