diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-12-22 18:44:54 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-12-22 19:32:55 -0500 |
commit | 50b178512b7d6e7724f87459f6bd06504c9c2da1 (patch) | |
tree | 0de7ef5345a3d1ae20b8f6082dc55d5ef2291f69 /drivers | |
parent | 3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff) |
Newly inserted battery might differ from one just removed, so
update of battery info fields is required.
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Acked-by: Andy Neitzke <neitzke@ias.edu>
Signed-off-by: Alexey Starikovskiy <astarikovskiy <at> suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/battery.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 1423b0c0cd2e..65132f920459 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -471,7 +471,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery) | |||
471 | 471 | ||
472 | static int acpi_battery_update(struct acpi_battery *battery) | 472 | static int acpi_battery_update(struct acpi_battery *battery) |
473 | { | 473 | { |
474 | int result; | 474 | int result, old_present = acpi_battery_present(battery); |
475 | result = acpi_battery_get_status(battery); | 475 | result = acpi_battery_get_status(battery); |
476 | if (result) | 476 | if (result) |
477 | return result; | 477 | return result; |
@@ -482,7 +482,8 @@ static int acpi_battery_update(struct acpi_battery *battery) | |||
482 | return 0; | 482 | return 0; |
483 | } | 483 | } |
484 | #endif | 484 | #endif |
485 | if (!battery->update_time) { | 485 | if (!battery->update_time || |
486 | old_present != acpi_battery_present(battery)) { | ||
486 | result = acpi_battery_get_info(battery); | 487 | result = acpi_battery_get_info(battery); |
487 | if (result) | 488 | if (result) |
488 | return result; | 489 | return result; |