diff options
author | Hans de Goede <hdegoede@redhat.com> | 2009-02-17 13:59:54 -0500 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2009-02-17 13:59:54 -0500 |
commit | 18632f84fac770125c0982dfadec6b551e82144e (patch) | |
tree | 9bcf592080c5f19f22a5ef726f0f4fa866ee381b | |
parent | 603eaa1bdd3e0402085e815cc531bb0a32827a9e (diff) |
hwmon: Fix ACPI resource check error handling
This patch fixes a number of cases where things were not properly
cleaned up when acpi_check_resource_conflict() returned an error,
causing oopses such as the one reported here:
https://bugzilla.redhat.com/show_bug.cgi?id=483208
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r-- | drivers/hwmon/f71882fg.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/vt1211.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/w83627ehf.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c index 367f6cb1166c..5f81ddf71508 100644 --- a/drivers/hwmon/f71882fg.c +++ b/drivers/hwmon/f71882fg.c | |||
@@ -1932,7 +1932,7 @@ static int __init f71882fg_device_add(unsigned short address, | |||
1932 | res.name = f71882fg_pdev->name; | 1932 | res.name = f71882fg_pdev->name; |
1933 | err = acpi_check_resource_conflict(&res); | 1933 | err = acpi_check_resource_conflict(&res); |
1934 | if (err) | 1934 | if (err) |
1935 | return err; | 1935 | goto exit_device_put; |
1936 | 1936 | ||
1937 | err = platform_device_add_resources(f71882fg_pdev, &res, 1); | 1937 | err = platform_device_add_resources(f71882fg_pdev, &res, 1); |
1938 | if (err) { | 1938 | if (err) { |
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c index b0ce37852281..73f77a9b8b18 100644 --- a/drivers/hwmon/vt1211.c +++ b/drivers/hwmon/vt1211.c | |||
@@ -1262,7 +1262,7 @@ static int __init vt1211_device_add(unsigned short address) | |||
1262 | res.name = pdev->name; | 1262 | res.name = pdev->name; |
1263 | err = acpi_check_resource_conflict(&res); | 1263 | err = acpi_check_resource_conflict(&res); |
1264 | if (err) | 1264 | if (err) |
1265 | goto EXIT; | 1265 | goto EXIT_DEV_PUT; |
1266 | 1266 | ||
1267 | err = platform_device_add_resources(pdev, &res, 1); | 1267 | err = platform_device_add_resources(pdev, &res, 1); |
1268 | if (err) { | 1268 | if (err) { |
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index cb808d015361..feae743ba991 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
@@ -1548,7 +1548,7 @@ static int __init sensors_w83627ehf_init(void) | |||
1548 | 1548 | ||
1549 | err = acpi_check_resource_conflict(&res); | 1549 | err = acpi_check_resource_conflict(&res); |
1550 | if (err) | 1550 | if (err) |
1551 | goto exit; | 1551 | goto exit_device_put; |
1552 | 1552 | ||
1553 | err = platform_device_add_resources(pdev, &res, 1); | 1553 | err = platform_device_add_resources(pdev, &res, 1); |
1554 | if (err) { | 1554 | if (err) { |