1 files changed, 16 insertions, 0 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 95649d373071..68bc227e7c4c 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -631,6 +631,17 @@ static int acpi_battery_update(struct acpi_battery *battery)
         return result;
 }
 
+static void acpi_battery_refresh(struct acpi_battery *battery)
+{
+        if (!battery->bat.dev)
+                return;
+
+        acpi_battery_get_info(battery);
+        /* The battery may have changed its reporting units. */
+        sysfs_remove_battery(battery);
+        sysfs_add_battery(battery);
+}
+
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
@@ -868,6 +879,8 @@ static int acpi_battery_add_fs(struct acpi_device *device)
         struct proc_dir_entry *entry = NULL;
         int i;
 
+        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"
+                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
         if (!acpi_device_dir(device)) {
                 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
                                                      acpi_battery_dir);
@@ -914,6 +927,8 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
         if (!battery)
                 return;
         old = battery->bat.dev;
+        if (event == ACPI_BATTERY_NOTIFY_INFO)
+                acpi_battery_refresh(battery);
         acpi_battery_update(battery);
         acpi_bus_generate_proc_event(device, event,
                                      acpi_battery_present(battery));
@@ -983,6 +998,7 @@ static int acpi_battery_resume(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
         battery = acpi_driver_data(device);
+        acpi_battery_refresh(battery);
         battery->update_time = 0;
         acpi_battery_update(battery);
         return 0;