diff options
Diffstat (limited to 'drivers/hwmon/f71805f.c')
-rw-r--r-- | drivers/hwmon/f71805f.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c index 7a14a2dbb752..899876579253 100644 --- a/drivers/hwmon/f71805f.c +++ b/drivers/hwmon/f71805f.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/mutex.h> | 39 | #include <linux/mutex.h> |
40 | #include <linux/sysfs.h> | 40 | #include <linux/sysfs.h> |
41 | #include <linux/ioport.h> | 41 | #include <linux/ioport.h> |
42 | #include <linux/acpi.h> | ||
42 | #include <asm/io.h> | 43 | #include <asm/io.h> |
43 | 44 | ||
44 | static unsigned short force_id; | 45 | static unsigned short force_id; |
@@ -1455,6 +1456,10 @@ static int __init f71805f_device_add(unsigned short address, | |||
1455 | } | 1456 | } |
1456 | 1457 | ||
1457 | res.name = pdev->name; | 1458 | res.name = pdev->name; |
1459 | err = acpi_check_resource_conflict(&res); | ||
1460 | if (err) | ||
1461 | goto exit_device_put; | ||
1462 | |||
1458 | err = platform_device_add_resources(pdev, &res, 1); | 1463 | err = platform_device_add_resources(pdev, &res, 1); |
1459 | if (err) { | 1464 | if (err) { |
1460 | printk(KERN_ERR DRVNAME ": Device resource addition failed " | 1465 | printk(KERN_ERR DRVNAME ": Device resource addition failed " |