diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-09-08 16:42:36 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-09 17:34:20 -0400 |
commit | b51f64c0de0355338480093abb35d5232f6d349a (patch) | |
tree | 5d72e0ef37629387c8613c2b48afadafbeaca6b4 /drivers/hwmon | |
parent | 860e1d6b46bd4cbc67d8d065f0f682143513382f (diff) |
[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: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/sis5595.c | 5 | ||||
-rw-r--r-- | drivers/hwmon/via686a.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index 8610bce08244..21aa9a41f62c 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c | |||
@@ -758,11 +758,6 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev, | |||
758 | return -ENODEV; | 758 | return -ENODEV; |
759 | } | 759 | } |
760 | 760 | ||
761 | if (!address) { | ||
762 | dev_err(&dev->dev,"No SiS 5595 sensors found.\n"); | ||
763 | return -ENODEV; | ||
764 | } | ||
765 | |||
766 | s_bridge = pci_dev_get(dev); | 761 | s_bridge = pci_dev_get(dev); |
767 | if (i2c_isa_add_driver(&sis5595_driver)) { | 762 | if (i2c_isa_add_driver(&sis5595_driver)) { |
768 | pci_dev_put(s_bridge); | 763 | pci_dev_put(s_bridge); |
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c index eb84997627c8..05ddc88e7dd2 100644 --- a/drivers/hwmon/via686a.c +++ b/drivers/hwmon/via686a.c | |||
@@ -812,11 +812,6 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev, | |||
812 | return -ENODEV; | 812 | return -ENODEV; |
813 | } | 813 | } |
814 | 814 | ||
815 | if (!address) { | ||
816 | dev_err(&dev->dev, "No Via 686A sensors found.\n"); | ||
817 | return -ENODEV; | ||
818 | } | ||
819 | |||
820 | s_bridge = pci_dev_get(dev); | 815 | s_bridge = pci_dev_get(dev); |
821 | if (i2c_isa_add_driver(&via686a_driver)) { | 816 | if (i2c_isa_add_driver(&via686a_driver)) { |
822 | pci_dev_put(s_bridge); | 817 | pci_dev_put(s_bridge); |