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

Commit f282693f authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Matthias Brugger
Browse files

soc: mediatek: PMIC wrap: Fix error handling 



According to error handling in this function, it is likely that going to
'err_out2' was expected here.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent 36c310f5

drivers/soc/mediatek/mtk-pmic-wrap.c

+6 −3
Original line number Diff line number Diff line
@@ -1200,7 +1200,8 @@ static int pwrap_probe(struct platform_device *pdev) 


	if (!(pwrap_readl(wrp, PWRAP_WACS2_RDATA) & PWRAP_STATE_INIT_DONE0)) {

		dev_dbg(wrp->dev, "initialization isn't finished\n");

		return -ENODEV;

		ret = -ENODEV;

		goto err_out2;

	}



	/* Initialize watchdog, may not be done by the bootloader */
@@ -1220,8 +1221,10 @@ static int pwrap_probe(struct platform_device *pdev) 
		goto err_out2;



	wrp->regmap = devm_regmap_init(wrp->dev, NULL, wrp, &pwrap_regmap_config);

	if (IS_ERR(wrp->regmap))

		return PTR_ERR(wrp->regmap);

	if (IS_ERR(wrp->regmap)) {

		ret = PTR_ERR(wrp->regmap);

		goto err_out2;

	}



	ret = of_platform_populate(np, NULL, NULL, wrp->dev);

	if (ret) {