Commit be2c0d54 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Sebastian Reichel
Browse files

power: supply: ab8500: Fix the error handling path of ab8500_charger_probe() 



Since the commit below, ab8500_bm_of_remove() needs to be called after a
successful ab8500_bm_of_probe() call.
This commit has only updated the remove function.

Fix the error handling path of the probe the same way.

Fixes: 6252c706 ("power: supply: ab8500: Standardize operating temperature")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 1c1348bf

drivers/power/supply/ab8500_charger.c

+6 −2
Original line number Diff line number Diff line
@@ -3665,11 +3665,13 @@ static int ab8500_charger_probe(struct platform_device *pdev) 
	}

	if (!match) {

		dev_err(dev, "no matching components\n");

		return -ENODEV;

		ret = -ENODEV;

		goto remove_ab8500_bm;

	}

	if (IS_ERR(match)) {

		dev_err(dev, "could not create component match\n");

		return PTR_ERR(match);

		ret = PTR_ERR(match);

		goto remove_ab8500_bm;

	}



	/* Notifier for external charger enabling */
@@ -3710,6 +3712,8 @@ static int ab8500_charger_probe(struct platform_device *pdev) 
	if (!di->ac_chg.enabled)

		blocking_notifier_chain_unregister(

			&charger_notifier_list, &charger_nb);

remove_ab8500_bm:

	ab8500_bm_of_remove(di->usb_chg.psy, di->bm);

	return ret;

}