power: supply: Init device wakeup after device_add()

We may want to use the device pointer in device_init_wakeup() with
functions that expect the device to already be added with device_add().
For example, if we were to link the device initializing wakeup to
something in sysfs such as a class for wakeups we'll run into an error.
It looks like this code was written with the assumption that the device
would be added before initializing wakeup due to the order of operations
in power_supply_unregister().

Let's change the order of operations so we don't run into problems here.

Fixes: 948dcf966228 ("power_supply: Prevent suspend until power supply events are processed")
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Tri Vo <trong@android.com>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Ravi Chandra Sadineni <ravisadineni@chromium.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 82e84801264c20e8773e70a72116d3dbf92304eb..5c36c430ce8b6f843cde9f6cd44957ecae7aed9f 100644 (file)
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -1051,14 +1051,14 @@ __power_supply_register(struct device *parent,
        }
 
        spin_lock_init(&psy->changed_lock);
-       rc = device_init_wakeup(dev, ws);
-       if (rc)
-               goto wakeup_init_failed;
-
        rc = device_add(dev);
        if (rc)
                goto device_add_failed;
 
+       rc = device_init_wakeup(dev, ws);
+       if (rc)
+               goto wakeup_init_failed;
+
        rc = psy_register_thermal(psy);
        if (rc)
                goto register_thermal_failed;
@@ -1101,8 +1101,8 @@ register_cooler_failed:
        psy_unregister_thermal(psy);
 register_thermal_failed:
        device_del(dev);
-device_add_failed:
 wakeup_init_failed:
+device_add_failed:
 check_supplies_failed:
 dev_set_name_failed:
        put_device(dev);