diff options
Diffstat (limited to 'drivers/hwmon/pc87427.c')
-rw-r--r-- | drivers/hwmon/pc87427.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c index 7265f22ae5cd..3a8a0f7a7736 100644 --- a/drivers/hwmon/pc87427.c +++ b/drivers/hwmon/pc87427.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/mutex.h> | 32 | #include <linux/mutex.h> |
33 | #include <linux/sysfs.h> | 33 | #include <linux/sysfs.h> |
34 | #include <linux/ioport.h> | 34 | #include <linux/ioport.h> |
35 | #include <linux/acpi.h> | ||
35 | #include <asm/io.h> | 36 | #include <asm/io.h> |
36 | 37 | ||
37 | static unsigned short force_id; | 38 | static unsigned short force_id; |
@@ -524,6 +525,10 @@ static int __init pc87427_device_add(unsigned short address) | |||
524 | }; | 525 | }; |
525 | int err; | 526 | int err; |
526 | 527 | ||
528 | err = acpi_check_resource_conflict(&res); | ||
529 | if (err) | ||
530 | goto exit; | ||
531 | |||
527 | pdev = platform_device_alloc(DRVNAME, address); | 532 | pdev = platform_device_alloc(DRVNAME, address); |
528 | if (!pdev) { | 533 | if (!pdev) { |
529 | err = -ENOMEM; | 534 | err = -ENOMEM; |