diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:36:59 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:36:59 -0500 |
| commit | a8e896e2813316a2d3657dc07d5eef83c3b2d9f4 (patch) | |
| tree | b1151588bb4b355fe6956348435f2adb409aa3f2 /drivers/acpi | |
| parent | 39cecf2091f10c3a5052d1e58da690d20852b243 (diff) | |
| parent | 50b178512b7d6e7724f87459f6bd06504c9c2da1 (diff) | |
Merge branch 'battery' into release
Diffstat (limited to 'drivers/acpi')
| -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; |