diff options
Diffstat (limited to 'drivers/hwmon/vt1211.c')
-rw-r--r-- | drivers/hwmon/vt1211.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c index 12b43590fa53..b0ce37852281 100644 --- a/drivers/hwmon/vt1211.c +++ b/drivers/hwmon/vt1211.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/err.h> | 32 | #include <linux/err.h> |
33 | #include <linux/mutex.h> | 33 | #include <linux/mutex.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 int uch_config = -1; | 38 | static int uch_config = -1; |
@@ -1259,6 +1260,10 @@ static int __init vt1211_device_add(unsigned short address) | |||
1259 | } | 1260 | } |
1260 | 1261 | ||
1261 | res.name = pdev->name; | 1262 | res.name = pdev->name; |
1263 | err = acpi_check_resource_conflict(&res); | ||
1264 | if (err) | ||
1265 | goto EXIT; | ||
1266 | |||
1262 | err = platform_device_add_resources(pdev, &res, 1); | 1267 | err = platform_device_add_resources(pdev, &res, 1); |
1263 | if (err) { | 1268 | if (err) { |
1264 | printk(KERN_ERR DRVNAME ": Device resource addition failed " | 1269 | printk(KERN_ERR DRVNAME ": Device resource addition failed " |