aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/it87.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hwmon/it87.c')
-rw-r--r--drivers/hwmon/it87.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 0e0d692f0c9e..88e71f195ec7 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -49,6 +49,7 @@
49#include <linux/sysfs.h> 49#include <linux/sysfs.h>
50#include <linux/string.h> 50#include <linux/string.h>
51#include <linux/dmi.h> 51#include <linux/dmi.h>
52#include <linux/acpi.h>
52#include <asm/io.h> 53#include <asm/io.h>
53 54
54#define DRVNAME "it87" 55#define DRVNAME "it87"
@@ -1552,6 +1553,10 @@ static int __init it87_device_add(unsigned short address,
1552 }; 1553 };
1553 int err; 1554 int err;
1554 1555
1556 err = acpi_check_resource_conflict(&res);
1557 if (err)
1558 goto exit;
1559
1555 pdev = platform_device_alloc(DRVNAME, address); 1560 pdev = platform_device_alloc(DRVNAME, address);
1556 if (!pdev) { 1561 if (!pdev) {
1557 err = -ENOMEM; 1562 err = -ENOMEM;