diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 13:59:38 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 13:59:38 +1100 |
| commit | c1b513723ea64006c491f2c1849bfa3f3ca73857 (patch) | |
| tree | 817f90018aae09fdcfe6150980f13964c4128c6a /drivers/hwmon/pc87360.c | |
| parent | 7b45e1b23b29da61e3a761fb3569c9073f513aeb (diff) | |
| parent | c2a437b912fa9324ca25ad6ea32b5a26f1df1ef3 (diff) | |
Merge branch 'quilt/jdelvare-hwmon'
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 @@ #include <linux/hwmon-vid.h> #include <linux/err.h> #include <linux/mutex.h> +#include <linux/acpi.h> #include <asm/io.h> static u8 devid; @@ -1627,6 +1628,11 @@ static int __init pc87360_device_add(unsigned short address) continue; res.start = extra_isa[i]; res.end = extra_isa[i] + PC87360_EXTENT - 1; + + err = acpi_check_resource_conflict(&res); + if (err) + goto exit_device_put; + err = platform_device_add_resources(pdev, &res, 1); if (err) { printk(KERN_ERR "pc87360: Device resource[%d] " |