diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /drivers/acpi/battery.c | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 68bc227e7c4c..ac1a599f5147 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -998,7 +998,6 @@ static int acpi_battery_resume(struct acpi_device *device) | |||
| 998 | if (!device) | 998 | if (!device) |
| 999 | return -EINVAL; | 999 | return -EINVAL; |
| 1000 | battery = acpi_driver_data(device); | 1000 | battery = acpi_driver_data(device); |
| 1001 | acpi_battery_refresh(battery); | ||
| 1002 | battery->update_time = 0; | 1001 | battery->update_time = 0; |
| 1003 | acpi_battery_update(battery); | 1002 | acpi_battery_update(battery); |
| 1004 | return 0; | 1003 | return 0; |