From 7830c4143d9eee807b6974b50f9658e9770bec23 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Thu, 18 Jun 2009 00:38:27 -0400
Subject: [PATCH] --- yaml --- r: 154205 b: refs/heads/master c:
 586caae36cece718ff46b3a59b88af79e9f7a2e0 h: refs/heads/master i:   154203:
 6cc8974b7dbe1c2e2d9a0b097718bd57139dfad1 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/acpi/battery.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 51e5c40176af..df6177db1694 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff754e2e85557ed7244385f0f2053c80e8ac9948
+refs/heads/master: 586caae36cece718ff46b3a59b88af79e9f7a2e0
diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c
index eb00c4e3747a..58b4517ce712 100644
--- a/trunk/drivers/acpi/battery.c
+++ b/trunk/drivers/acpi/battery.c
@@ -832,14 +832,12 @@ static int acpi_battery_add(struct acpi_device *device)
 	acpi_battery_update(battery);
 #ifdef CONFIG_ACPI_PROCFS_POWER
 	result = acpi_battery_add_fs(device);
-	if (result)
-		goto end;
 #endif
-	printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
-	       ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
-	       device->status.battery_present ? "present" : "absent");
-      end:
-	if (result) {
+	if (!result) {
+		printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
+			ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
+			device->status.battery_present ? "present" : "absent");
+	} else {
 #ifdef CONFIG_ACPI_PROCFS_POWER
 		acpi_battery_remove_fs(device);
 #endif