diff options
Diffstat (limited to 'drivers/hwmon/w83627hf.c')
-rw-r--r-- | drivers/hwmon/w83627hf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c index b30e5796cb26..389150ba30d3 100644 --- a/drivers/hwmon/w83627hf.c +++ b/drivers/hwmon/w83627hf.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <linux/err.h> | 50 | #include <linux/err.h> |
51 | #include <linux/mutex.h> | 51 | #include <linux/mutex.h> |
52 | #include <linux/ioport.h> | 52 | #include <linux/ioport.h> |
53 | #include <linux/acpi.h> | ||
53 | #include <asm/io.h> | 54 | #include <asm/io.h> |
54 | #include "lm75.h" | 55 | #include "lm75.h" |
55 | 56 | ||
@@ -1793,6 +1794,10 @@ static int __init w83627hf_device_add(unsigned short address, | |||
1793 | }; | 1794 | }; |
1794 | int err; | 1795 | int err; |
1795 | 1796 | ||
1797 | err = acpi_check_resource_conflict(&res); | ||
1798 | if (err) | ||
1799 | goto exit; | ||
1800 | |||
1796 | pdev = platform_device_alloc(DRVNAME, address); | 1801 | pdev = platform_device_alloc(DRVNAME, address); |
1797 | if (!pdev) { | 1802 | if (!pdev) { |
1798 | err = -ENOMEM; | 1803 | err = -ENOMEM; |