1 files changed, 18 insertions, 9 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 69cbc57c2d1c..5dfe18bf24cb 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/jiffies.h>
+#include <linux/async.h>
 
 #ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
@@ -92,7 +93,7 @@ struct acpi_battery {
 #endif
         struct acpi_device *device;
         unsigned long update_time;
-        int current_now;
+        int rate_now;
         int capacity_now;
         int voltage_now;
         int design_capacity;
@@ -196,7 +197,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
                 val->intval = battery->voltage_now * 1000;
                 break;
         case POWER_SUPPLY_PROP_CURRENT_NOW:
-                val->intval = battery->current_now * 1000;
+        case POWER_SUPPLY_PROP_POWER_NOW:
+                val->intval = battery->rate_now * 1000;
                 break;
         case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
         case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
@@ -247,6 +249,7 @@ static enum power_supply_property energy_battery_props[] = {
         POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
         POWER_SUPPLY_PROP_VOLTAGE_NOW,
         POWER_SUPPLY_PROP_CURRENT_NOW,
+        POWER_SUPPLY_PROP_POWER_NOW,
         POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_FULL,
         POWER_SUPPLY_PROP_ENERGY_NOW,
@@ -273,7 +276,7 @@ struct acpi_offsets {
 
 static struct acpi_offsets state_offsets[] = {
         {offsetof(struct acpi_battery, state), 0},
-        {offsetof(struct acpi_battery, current_now), 0},
+        {offsetof(struct acpi_battery, rate_now), 0},
         {offsetof(struct acpi_battery, capacity_now), 0},
         {offsetof(struct acpi_battery, voltage_now), 0},
 };
@@ -605,11 +608,11 @@ static int acpi_battery_print_state(struct seq_file *seq, int result)
         else
                 seq_printf(seq, "charging state:          charged\n");
 
-        if (battery->current_now == ACPI_BATTERY_VALUE_UNKNOWN)
+        if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
                 seq_printf(seq, "present rate:            unknown\n");
         else
                 seq_printf(seq, "present rate:            %d %s\n",
-                           battery->current_now, acpi_battery_units(battery));
+                           battery->rate_now, acpi_battery_units(battery));
 
         if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN)
                 seq_printf(seq, "remaining capacity:      unknown\n");
@@ -901,21 +904,27 @@ static struct acpi_driver acpi_battery_driver = {
                 },
 };
 
-static int __init acpi_battery_init(void)
+static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
 {
         if (acpi_disabled)
-                return -ENODEV;
+                return;
 #ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_battery_dir = acpi_lock_battery_dir();
         if (!acpi_battery_dir)
-                return -ENODEV;
+                return;
 #endif
         if (acpi_bus_register_driver(&acpi_battery_driver) < 0) {
 #ifdef CONFIG_ACPI_PROCFS_POWER
                 acpi_unlock_battery_dir(acpi_battery_dir);
 #endif
-                return -ENODEV;
+                return;
         }
+        return;
+}
+
+static int __init acpi_battery_init(void)
+{
+        async_schedule(acpi_battery_init_async, NULL);
         return 0;
 }