Hi,
On Wed, Mar 24, 2021 at 11:21:34AM +0200, Matti Vaittinen wrote:
> The commit 6d0c5de2fd84
> ("power: supply: Clean-up few drivers by using managed work init")
> Re-introduced wrong order of initializing work-queue and requesting
> the IRQs which was originally fixed by the commit b5e8642ed95f
> ("power: supply: axp20x_usb_power: Init work before enabling IRQs")
>
> In addition this caused the work queue to be initialized twice.
>
> Fix it again.
>
> Fixes: 6d0c5de2fd84 ("power: supply: Clean-up few drivers by using managed
> work init")
>
> Signed-off-by: Matti Vaittinen <matti.vaitti...@fi.rohmeurope.com>
> Reported-by: Chen-Yu Tsai <w...@csie.org>
> ---
Acked-by: Sebastian Reichel <sebastian.reic...@collabora.com>
Needs to be merged by Greg, since I do not have 6d0c5de2fd84 in
my tree.
-- Sebastian
> drivers/power/supply/axp20x_usb_power.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/power/supply/axp20x_usb_power.c
> b/drivers/power/supply/axp20x_usb_power.c
> index 4259709e3491..e954970b50e6 100644
> --- a/drivers/power/supply/axp20x_usb_power.c
> +++ b/drivers/power/supply/axp20x_usb_power.c
> @@ -594,7 +594,11 @@ static int axp20x_usb_power_probe(struct platform_device
> *pdev)
> power->axp20x_id = axp_data->axp20x_id;
> power->regmap = axp20x->regmap;
> power->num_irqs = axp_data->num_irq_names;
> - INIT_DELAYED_WORK(&power->vbus_detect, axp20x_usb_power_poll_vbus);
> +
> + ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
> + axp20x_usb_power_poll_vbus);
> + if (ret)
> + return ret;
>
> if (power->axp20x_id == AXP202_ID) {
> /* Enable vbus valid checking */
> @@ -647,10 +651,6 @@ static int axp20x_usb_power_probe(struct platform_device
> *pdev)
> }
> }
>
> - ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
> - axp20x_usb_power_poll_vbus);
> - if (ret)
> - return ret;
> if (axp20x_usb_vbus_needs_polling(power))
> queue_delayed_work(system_power_efficient_wq,
> &power->vbus_detect, 0);
>
> --
> 2.25.4
>
>
> --
> Matti Vaittinen, Linux device drivers
> ROHM Semiconductors, Finland SWDC
> Kiviharjunlenkki 1E
> 90220 OULU
> FINLAND
>
> ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
> Simon says - in Latin please.
> ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
> Thanks to Simon Glass for the translation =]
signature.asc
Description: PGP signature
