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

Commit b51f64c0 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] hwmon: fix sis5595, via686a force_addr module parameter 



Recent changes to the i2c-isa design broke the force_addr parameter of
two hardware monitoring drivers as a side effect: sis5595 and via686a.
The last address test was in fact useless beforehand, and the redesign
turned it into a bug. I'm sorry about that.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 860e1d6b

drivers/hwmon/sis5595.c

+0 −5
Original line number Diff line number Diff line
@@ -758,11 +758,6 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev, 
		return -ENODEV;

	}



	if (!address) {

		dev_err(&dev->dev,"No SiS 5595 sensors found.\n");

		return -ENODEV;

	}



	s_bridge = pci_dev_get(dev);

	if (i2c_isa_add_driver(&sis5595_driver)) {

		pci_dev_put(s_bridge);

drivers/hwmon/via686a.c

+0 −5
Original line number Diff line number Diff line
@@ -812,11 +812,6 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev, 
		return -ENODEV;

	}



	if (!address) {

		dev_err(&dev->dev, "No Via 686A sensors found.\n");

		return -ENODEV;

	}



	s_bridge = pci_dev_get(dev);

	if (i2c_isa_add_driver(&via686a_driver)) {

		pci_dev_put(s_bridge);