diff options
Diffstat (limited to 'drivers/hwmon/vt8231.c')
-rw-r--r-- | drivers/hwmon/vt8231.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c index 5bc57275cae8..9982b45fbb14 100644 --- a/drivers/hwmon/vt8231.c +++ b/drivers/hwmon/vt8231.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/hwmon-vid.h> | 35 | #include <linux/hwmon-vid.h> |
36 | #include <linux/err.h> | 36 | #include <linux/err.h> |
37 | #include <linux/mutex.h> | 37 | #include <linux/mutex.h> |
38 | #include <linux/acpi.h> | ||
38 | #include <asm/io.h> | 39 | #include <asm/io.h> |
39 | 40 | ||
40 | static int force_addr; | 41 | static int force_addr; |
@@ -894,6 +895,10 @@ static int __devinit vt8231_device_add(unsigned short address) | |||
894 | }; | 895 | }; |
895 | int err; | 896 | int err; |
896 | 897 | ||
898 | err = acpi_check_resource_conflict(&res); | ||
899 | if (err) | ||
900 | goto exit; | ||
901 | |||
897 | pdev = platform_device_alloc("vt8231", address); | 902 | pdev = platform_device_alloc("vt8231", address); |
898 | if (!pdev) { | 903 | if (!pdev) { |
899 | err = -ENOMEM; | 904 | err = -ENOMEM; |