Subject: [PATCH] 2.6.24-rc1: ensure "present" sysfs attribute even if battery is absent From: Andrey Borzenkov Ensure that we always have "present" attribute in sysfs. This is compatible with procfs case where we had "present: no" if battery was not available. This fixes HAL battery detection where it does pretend battery is present but canot provide any value for it. Signed-off-by: Andrey Borzenkov --- drivers/acpi/battery.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 681e26b..6e67fcd 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -187,6 +187,10 @@ static int acpi_battery_get_property(struct power_supply *psy, return 0; } +static enum power_supply_property missing_battery_props[] = { + POWER_SUPPLY_PROP_PRESENT, +}; + static enum power_supply_property charge_battery_props[] = { POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_PRESENT, @@ -389,8 +393,13 @@ static int acpi_battery_update(struct acpi_battery *battery) { int saved_present = acpi_battery_present(battery); int result = acpi_battery_get_status(battery); - if (result || !acpi_battery_present(battery)) + if (result) return result; + if (!acpi_battery_present(battery)) { + battery->bat.properties = missing_battery_props; + battery->bat.num_properties = ARRAY_SIZE(missing_battery_props); + return result; + } if (saved_present != acpi_battery_present(battery) || !battery->update_time) { battery->update_time = 0;