lkml.org 
[lkml]   [2017]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] soc: mediatek: PMIC wrap: Fix error handling
From
Date


On 19/02/17 14:12, Christophe JAILLET wrote:
> 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>

Applied to v4.12-next/soc

Sorry for the delay.
Matthias

> ---
> drivers/soc/mediatek/mtk-pmic-wrap.c | 9 ++++++---
> 1 file 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) {
>

\
 
 \ /
  Last update: 2017-05-10 21:21    [W:0.028 / U:1.976 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site