lkml.org 
[lkml]   [2019]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] power: supply: Init device wakeup after device_add()
Date
On Thursday, August 1, 2019 11:33:30 PM CEST Stephen Boyd wrote:
> 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: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
>
> See this thread[1] for more information on how this will be necessary.
>
> [1] https://lkml.kernel.org/r/20190731215514.212215-1-trong@android.com
>
>
> drivers/power/supply/power_supply_core.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 82e84801264c..5c36c430ce8b 100644
> --- 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 @@ __power_supply_register(struct device *parent,
> 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);
>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>




\
 
 \ /
  Last update: 2019-08-02 12:09    [W:0.068 / U:2.920 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site