Skip to content

Commit

Permalink
hwmon: Fix ACPI resource check error handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hans de Goede authored and Jean Delvare committed Feb 17, 2009
1 parent 603eaa1 commit 18632f8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/hwmon/f71882fg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1932,7 +1932,7 @@ static int __init f71882fg_device_add(unsigned short address,
res.name = f71882fg_pdev->name;
err = acpi_check_resource_conflict(&res);
if (err)
return err;
goto exit_device_put;

err = platform_device_add_resources(f71882fg_pdev, &res, 1);
if (err) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/vt1211.c
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@ static int __init vt1211_device_add(unsigned short address)
res.name = pdev->name;
err = acpi_check_resource_conflict(&res);
if (err)
goto EXIT;
goto EXIT_DEV_PUT;

err = platform_device_add_resources(pdev, &res, 1);
if (err) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/w83627ehf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1548,7 +1548,7 @@ static int __init sensors_w83627ehf_init(void)

err = acpi_check_resource_conflict(&res);
if (err)
goto exit;
goto exit_device_put;

err = platform_device_add_resources(pdev, &res, 1);
if (err) {
Expand Down

0 comments on commit 18632f8

Please sign in to comment.