diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-11 11:33:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-11 11:33:05 +1100 |
| commit | 85f104833e8f31be6743e710b99e1284e2e7b869 (patch) | |
| tree | 4ac99d997b3b0d6b1466d4588da783e3e12ff2ca /drivers/hwmon/it87.c | |
| parent | a5a0809f0f6482f6d4b95aef2174e3c349f360a1 (diff) | |
| parent | 6ae4e93730b5c1f00291797d29944022ecbdfe34 (diff) | |
Merge commit 'hwmon/testing'
Diffstat (limited to 'drivers/hwmon/it87.c')
| -rw-r--r-- | drivers/hwmon/it87.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index e12c132ff83a..2db65a420eef 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c @@ -46,6 +46,7 @@ #include <linux/err.h> #include <linux/mutex.h> #include <linux/sysfs.h> +#include <linux/acpi.h> #include <asm/io.h> #define DRVNAME "it87" @@ -1487,6 +1488,10 @@ static int __init it87_device_add(unsigned short address, }; int err; + err = acpi_check_resource_conflict(&res); + if (err) + goto exit; + pdev = platform_device_alloc(DRVNAME, address); if (!pdev) { err = -ENOMEM; |