lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI / Battery: propagate sysfs error in acpi_battery_add()

Browse Source 
Make sure the error return from sysfs_add_battery() is checked and
propagated out from acpi_battery_add().

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Stefan Hajnoczi
2011-07-12 09:03:29 +01:00
committed by Len Brown
parent e80bba4b51
commit eb03cb02b7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/battery.c
View File

@@ -630,8 +630,11 @@ static int acpi_battery_update(struct acpi_battery *battery)
return result; return result;
acpi_battery_init_alarm(battery); acpi_battery_init_alarm(battery);
} }
if (!battery->bat.dev) if (!battery->bat.dev) {
sysfs_add_battery(battery); result = sysfs_add_battery(battery);
if (result)
return result;
}
result = acpi_battery_get_state(battery); result = acpi_battery_get_state(battery);
acpi_battery_quirks(battery); acpi_battery_quirks(battery);
return result; return result;
@@ -982,7 +985,9 @@ static int acpi_battery_add(struct acpi_device *device)
if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle, if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle,
"_BIX", &handle))) "_BIX", &handle)))
set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags); 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 #ifdef CONFIG_ACPI_PROCFS_POWER
result = acpi_battery_add_fs(device); result = acpi_battery_add_fs(device);
#endif #endif