Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 165c2357 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

power: supply: axp288_charger: Properly stop work on probe-error / remove 



Properly stop any work we may have queued on probe-errors / remove.

Rather then adding a remove driver callback for this, and goto style
error handling to probe, use a devm_action for this.

The devm_action gets registered before we register any of the extcon
notifiers which may queue the work, devm does cleanup in reverse order,
so this ensures that the notifiers are removed before we cancel the work.

Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parent 8c0a0a29

drivers/power/supply/axp288_charger.c

+13 −0
Original line number Diff line number Diff line
@@ -724,6 +724,14 @@ static int charger_init_hw_regs(struct axp288_chrg_info *info) 
	return 0;

}



static void axp288_charger_cancel_work(void *data)

{

	struct axp288_chrg_info *info = data;



	cancel_work_sync(&info->otg.work);

	cancel_work_sync(&info->cable.work);

}



static int axp288_charger_probe(struct platform_device *pdev)

{

	int ret, i, pirq;
@@ -772,6 +780,11 @@ static int axp288_charger_probe(struct platform_device *pdev) 
		return ret;

	}



	/* Cancel our work on cleanup, register this before the notifiers */

	ret = devm_add_action(dev, axp288_charger_cancel_work, info);

	if (ret)

		return ret;



	/* Register for extcon notification */

	INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);

	info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;