aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/battery.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 13e7b56e33ae..f2eb6c37ea0a 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1237,13 +1237,11 @@ static int acpi_battery_add(struct acpi_device *device)
1237 1237
1238#ifdef CONFIG_ACPI_PROCFS_POWER 1238#ifdef CONFIG_ACPI_PROCFS_POWER
1239 result = acpi_battery_add_fs(device); 1239 result = acpi_battery_add_fs(device);
1240#endif
1241 if (result) { 1240 if (result) {
1242#ifdef CONFIG_ACPI_PROCFS_POWER
1243 acpi_battery_remove_fs(device); 1241 acpi_battery_remove_fs(device);
1244#endif
1245 goto fail; 1242 goto fail;
1246 } 1243 }
1244#endif
1247 1245
1248 printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n", 1246 printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
1249 ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device), 1247 ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),