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/via686a.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/via686a.c')
-rw-r--r-- | drivers/hwmon/via686a.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c index f1ee5e731968..a022aedcaacb 100644 --- a/drivers/hwmon/via686a.c +++ b/drivers/hwmon/via686a.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/init.h> | 41 | #include <linux/init.h> |
42 | #include <linux/mutex.h> | 42 | #include <linux/mutex.h> |
43 | #include <linux/sysfs.h> | 43 | #include <linux/sysfs.h> |
44 | #include <linux/acpi.h> | ||
44 | #include <asm/io.h> | 45 | #include <asm/io.h> |
45 | 46 | ||
46 | 47 | ||
@@ -783,6 +784,10 @@ static int __devinit via686a_device_add(unsigned short address) | |||
783 | }; | 784 | }; |
784 | int err; | 785 | int err; |
785 | 786 | ||
787 | err = acpi_check_resource_conflict(&res); | ||
788 | if (err) | ||
789 | goto exit; | ||
790 | |||
786 | pdev = platform_device_alloc("via686a", address); | 791 | pdev = platform_device_alloc("via686a", address); |
787 | if (!pdev) { | 792 | if (!pdev) { |
788 | err = -ENOMEM; | 793 | err = -ENOMEM; |