diff options
Diffstat (limited to 'drivers/hwmon/f71882fg.c')
-rw-r--r-- | drivers/hwmon/f71882fg.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c index d867b377d4e9..609cafff86bc 100644 --- a/drivers/hwmon/f71882fg.c +++ b/drivers/hwmon/f71882fg.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | #include <linux/acpi.h> | ||
31 | 32 | ||
32 | #define DRVNAME "f71882fg" | 33 | #define DRVNAME "f71882fg" |
33 | 34 | ||
@@ -1929,6 +1930,10 @@ static int __init f71882fg_device_add(unsigned short address, | |||
1929 | return -ENOMEM; | 1930 | return -ENOMEM; |
1930 | 1931 | ||
1931 | res.name = f71882fg_pdev->name; | 1932 | res.name = f71882fg_pdev->name; |
1933 | err = acpi_check_resource_conflict(&res); | ||
1934 | if (err) | ||
1935 | return err; | ||
1936 | |||
1932 | err = platform_device_add_resources(f71882fg_pdev, &res, 1); | 1937 | err = platform_device_add_resources(f71882fg_pdev, &res, 1); |
1933 | if (err) { | 1938 | if (err) { |
1934 | printk(KERN_ERR DRVNAME ": Device resource addition failed\n"); | 1939 | printk(KERN_ERR DRVNAME ": Device resource addition failed\n"); |