power: supply: axp20x_usb_power: fix work-queue init

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 <[e-mail]>
Reported-by: Chen-Yu Tsai <[e-mail]>
Acked-by: Sebastian Reichel <[e-mail]>
Link: https://lore.kernel.org/r/a774ca2[e-mail]
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

drivers/power/supply/axp20x_usb_power.c

···
 	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 */
···
 		}
 	}
 
-	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);