diff options
| author |   Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2017-02-19 14:12:49 +0100 |
|---|---|---|
| committer |   Matthias Brugger <matthias.bgg@gmail.com> | 2017-05-15 10:47:25 +0200 |
| commit | f282693f808723b6593db34c47fa0e17cb52586f (patch) | |
| tree | 8ebc2f2165fe3df476169112bc46b4b574c13604 /drivers/soc | |
| parent | soc: mediatek: add MT6797 scpsys support (diff) | |
| download | linux-dev-f282693f808723b6593db34c47fa0e17cb52586f.tar.xz linux-dev-f282693f808723b6593db34c47fa0e17cb52586f.zip | |
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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/mediatek/mtk-pmic-wrap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c index a5f10936fb9c..285b434449a6 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -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) { |