From 96d535fd120d3c7100c60c3555f517adebc51492 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Tue, 12 Jul 2011 09:03:29 +0100 Subject: [PATCH] --- yaml --- r: 262278 b: refs/heads/master c: eb03cb02b74df6dd0b653d5f6d976f16a434dfaf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/battery.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 350d92d43260..02add99158a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e80bba4b5108c6479379740201b0a5d9da5ffbac +refs/heads/master: eb03cb02b74df6dd0b653d5f6d976f16a434dfaf diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c index c771768f57c8..ffce2f06dd8d 100644 --- a/trunk/drivers/acpi/battery.c +++ b/trunk/drivers/acpi/battery.c @@ -630,8 +630,11 @@ static int acpi_battery_update(struct acpi_battery *battery) return result; acpi_battery_init_alarm(battery); } - if (!battery->bat.dev) - sysfs_add_battery(battery); + if (!battery->bat.dev) { + result = sysfs_add_battery(battery); + if (result) + return result; + } result = acpi_battery_get_state(battery); acpi_battery_quirks(battery); return result; @@ -982,7 +985,9 @@ static int acpi_battery_add(struct acpi_device *device) if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle, "_BIX", &handle))) set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags); - acpi_battery_update(battery); + result = acpi_battery_update(battery); + if (result) + goto fail; #ifdef CONFIG_ACPI_PROCFS_POWER result = acpi_battery_add_fs(device); #endif