From eace2f1e56eb4361d7c5522684a3f9131bad8b8d Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 17 Feb 2009 19:59:54 +0100
Subject: [PATCH] --- yaml --- r: 131418 b: refs/heads/master c:
 18632f84fac770125c0982dfadec6b551e82144e h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/hwmon/f71882fg.c  | 2 +-
 trunk/drivers/hwmon/vt1211.c    | 2 +-
 trunk/drivers/hwmon/w83627ehf.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 987aca2237fc..68df2935ab69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 603eaa1bdd3e0402085e815cc531bb0a32827a9e
+refs/heads/master: 18632f84fac770125c0982dfadec6b551e82144e
diff --git a/trunk/drivers/hwmon/f71882fg.c b/trunk/drivers/hwmon/f71882fg.c
index 367f6cb1166c..5f81ddf71508 100644
--- a/trunk/drivers/hwmon/f71882fg.c
+++ b/trunk/drivers/hwmon/f71882fg.c
@@ -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) {
diff --git a/trunk/drivers/hwmon/vt1211.c b/trunk/drivers/hwmon/vt1211.c
index b0ce37852281..73f77a9b8b18 100644
--- a/trunk/drivers/hwmon/vt1211.c
+++ b/trunk/drivers/hwmon/vt1211.c
@@ -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) {
diff --git a/trunk/drivers/hwmon/w83627ehf.c b/trunk/drivers/hwmon/w83627ehf.c
index cb808d015361..feae743ba991 100644
--- a/trunk/drivers/hwmon/w83627ehf.c
+++ b/trunk/drivers/hwmon/w83627ehf.c
@@ -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) {