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/w83627ehf.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/w83627ehf.c')
-rw-r--r-- | drivers/hwmon/w83627ehf.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 075164dd65a7..a3a01dc35a31 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <linux/hwmon-vid.h> | 48 | #include <linux/hwmon-vid.h> |
49 | #include <linux/err.h> | 49 | #include <linux/err.h> |
50 | #include <linux/mutex.h> | 50 | #include <linux/mutex.h> |
51 | #include <linux/acpi.h> | ||
51 | #include <asm/io.h> | 52 | #include <asm/io.h> |
52 | #include "lm75.h" | 53 | #include "lm75.h" |
53 | 54 | ||
@@ -1544,6 +1545,11 @@ static int __init sensors_w83627ehf_init(void) | |||
1544 | res.start = address + IOREGION_OFFSET; | 1545 | res.start = address + IOREGION_OFFSET; |
1545 | res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1; | 1546 | res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1; |
1546 | res.flags = IORESOURCE_IO; | 1547 | res.flags = IORESOURCE_IO; |
1548 | |||
1549 | err = acpi_check_resource_conflict(&res); | ||
1550 | if (err) | ||
1551 | goto exit; | ||
1552 | |||
1547 | err = platform_device_add_resources(pdev, &res, 1); | 1553 | err = platform_device_add_resources(pdev, &res, 1); |
1548 | if (err) { | 1554 | if (err) { |
1549 | printk(KERN_ERR DRVNAME ": Device resource addition failed " | 1555 | printk(KERN_ERR DRVNAME ": Device resource addition failed " |