soc: mediatek: PMIC wrap: Fix error handling
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>
Sun, 19 Feb 2017 13:12:49 +0000 (14:12 +0100)
committerMatthias Brugger <matthias.bgg@gmail.com>
Mon, 15 May 2017 08:47:25 +0000 (10:47 +0200)
According to error handling in this function, it is likely that going to
'err_out2' was expected here.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
drivers/soc/mediatek/mtk-pmic-wrap.c

index a5f10936fb9cbe15c0b7338108ee7e1cf830bb13..285b434449a640af4a7e68bddfdbc840f97c36a5 100644 (file)
@@ -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) {