diff options
author | Jean Delvare <jdelvare@suse.de> | 2009-01-07 10:37:35 -0500 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2009-01-07 10:37:35 -0500 |
commit | b9acb64a385c5b26fc392e0d58ac7b8e0a2cd812 (patch) | |
tree | efd4f47d256551082742a092a15ac9b28ddeefe5 /drivers/hwmon/pc87360.c | |
parent | c8ac32e4711639c81e5f4d4cd78c8f21675a2bae (diff) |
hwmon: Check for ACPI resource conflicts
Check for ACPI resource conflicts in hwmon drivers. I've included
all Super-I/O and PCI drivers.
I've voluntarily left out:
* Vendor-specific drivers: if they conflicted on any system, this would
pretty much mean that they conflict on all systems, and we would know
by now.
* Legacy ISA drivers (lm78 and w83781d): they only support chips found
on old designs were ACPI either wasn't supported or didn't deal with
thermal management.
* Drivers accessing the I/O resources indirectly (e.g. through SMBus):
the checks are already done where they belong, i.e. in the bus drivers.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Acked-by: David Hubbard <david.c.hubbard@gmail.com>
Diffstat (limited to 'drivers/hwmon/pc87360.c')
-rw-r--r-- | drivers/hwmon/pc87360.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c index 5fbfa34c110e..fb052fea3744 100644 --- a/drivers/hwmon/pc87360.c +++ b/drivers/hwmon/pc87360.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <linux/hwmon-vid.h> | 43 | #include <linux/hwmon-vid.h> |
44 | #include <linux/err.h> | 44 | #include <linux/err.h> |
45 | #include <linux/mutex.h> | 45 | #include <linux/mutex.h> |
46 | #include <linux/acpi.h> | ||
46 | #include <asm/io.h> | 47 | #include <asm/io.h> |
47 | 48 | ||
48 | static u8 devid; | 49 | static u8 devid; |
@@ -1627,6 +1628,11 @@ static int __init pc87360_device_add(unsigned short address) | |||
1627 | continue; | 1628 | continue; |
1628 | res.start = extra_isa[i]; | 1629 | res.start = extra_isa[i]; |
1629 | res.end = extra_isa[i] + PC87360_EXTENT - 1; | 1630 | res.end = extra_isa[i] + PC87360_EXTENT - 1; |
1631 | |||
1632 | err = acpi_check_resource_conflict(&res); | ||
1633 | if (err) | ||
1634 | goto exit_device_put; | ||
1635 | |||
1630 | err = platform_device_add_resources(pdev, &res, 1); | 1636 | err = platform_device_add_resources(pdev, &res, 1); |
1631 | if (err) { | 1637 | if (err) { |
1632 | printk(KERN_ERR "pc87360: Device resource[%d] " | 1638 | printk(KERN_ERR "pc87360: Device resource[%d] " |