[PATCH] 2.6.24-rc1: ensure "present" sysfs attribute even if battery is absent

Andrey Borzenkov
2007-10-27T16:54:45Z

[-- Attachment #1.1: Type: text/plain, Size: 207 bytes --]

I am not exactly sure about this one ... what other power_supply class drivers
do? Should I fix HAL instead (but then, I do not know whether HAL is the only
application that is using this interface).

[-- Attachment #1.2: 2.6.24-rc1_battery_present_property --]
[-- Type: text/x-diff, Size: 1625 bytes --]

Subject: [PATCH] 2.6.24-rc1: ensure "present" sysfs attribute even if battery is absent
From: Andrey Borzenkov <arvidjaar@mail.ru>

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 <arvidjaar@mail.ru>

---

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;

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]