aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/it87.c
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2009-01-07 10:37:35 -0500
committerJean Delvare <khali@linux-fr.org>2009-01-07 10:37:35 -0500
commitb9acb64a385c5b26fc392e0d58ac7b8e0a2cd812 (patch)
treeefd4f47d256551082742a092a15ac9b28ddeefe5 /drivers/hwmon/it87.c
parentc8ac32e4711639c81e5f4d4cd78c8f21675a2bae (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/it87.c')
-rw-r--r--drivers/hwmon/it87.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 0e0d692f0c9e..88e71f195ec7 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -49,6 +49,7 @@
49#include <linux/sysfs.h> 49#include <linux/sysfs.h>
50#include <linux/string.h> 50#include <linux/string.h>
51#include <linux/dmi.h> 51#include <linux/dmi.h>
52#include <linux/acpi.h>
52#include <asm/io.h> 53#include <asm/io.h>
53 54
54#define DRVNAME "it87" 55#define DRVNAME "it87"
@@ -1552,6 +1553,10 @@ static int __init it87_device_add(unsigned short address,
1552 }; 1553 };
1553 int err; 1554 int err;
1554 1555
1556 err = acpi_check_resource_conflict(&res);
1557 if (err)
1558 goto exit;
1559
1555 pdev = platform_device_alloc(DRVNAME, address); 1560 pdev = platform_device_alloc(DRVNAME, address);
1556 if (!pdev) { 1561 if (!pdev) {
1557 err = -ENOMEM; 1562 err = -ENOMEM;