Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18632f84 authored Feb 17, 2009 by Hans de Goede Committed by Jean Delvare Feb 17, 2009

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>

parent 603eaa1b

drivers/hwmon/f71882fg.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1932,7 +1932,7 @@ static int __init f71882fg_device_add(unsigned short address,
	res.name = f71882fg_pdev->name;		res.name = f71882fg_pdev->name;
	err = acpi_check_resource_conflict(&res);		err = acpi_check_resource_conflict(&res);
	if (err)		if (err)
	return err;		goto exit_device_put;

	err = platform_device_add_resources(f71882fg_pdev, &res, 1);		err = platform_device_add_resources(f71882fg_pdev, &res, 1);
	if (err) {		if (err) {

drivers/hwmon/vt1211.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1262,7 +1262,7 @@ static int __init vt1211_device_add(unsigned short address)
	res.name = pdev->name;		res.name = pdev->name;
	err = acpi_check_resource_conflict(&res);		err = acpi_check_resource_conflict(&res);
	if (err)		if (err)
	goto EXIT;		goto EXIT_DEV_PUT;

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

drivers/hwmon/w83627ehf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1548,7 +1548,7 @@ static int __init sensors_w83627ehf_init(void)

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

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