[PATCH] ASoC: mediatek: mt8188-mt6359: Fix error code in codec_init

[PATCH] ASoC: mediatek: mt8188-mt6359: Fix error code in codec_init

[Dan Carpenter]

Return -EINVAL on this error path instead of returning success.

Fixes: 9f08dcbddeb3 ("ASoC: mediatek: mt8188-mt6359: support new board with nau88255")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
This is based on static analysis and not tested.

 sound/soc/mediatek/mt8188/mt8188-mt6359.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
index bc4b74970a46..ae02bbcd5d4e 100644
--- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
+++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
@@ -594,7 +594,7 @@ static int mt8188_max98390_codec_init(struct snd_soc_pcm_runtime *rtd)
 	}
 
 	if (rtd->dai_link->num_codecs <= 2)
-		return ret;
+		return -EINVAL;
 
 	/* add widgets/controls/dapm for rear speakers */
 	ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_rear_spk_widgets,
-- 
2.39.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ASoC: mediatek: mt8188-mt6359: Fix error code in codec_init

[Trevor Wu (吳文良)]

On Wed, 2023-06-07 at 12:41 +0300, Dan Carpenter wrote:
>  Return -EINVAL on this error path instead of returning success.

Hi Dan,

I intended for the function to be reusable by both 2 and 4 amps, which
is why I added a condition in the middle.
This shouldn't be considered an error case, so there is no need to
return -EINVAL here.
Please kindly inform me if there are any errors in my understanding.

Thanks,
Trevor

> 
> Fixes: 9f08dcbddeb3 ("ASoC: mediatek: mt8188-mt6359: support new
> board with nau88255")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> This is based on static analysis and not tested.
> 
>  sound/soc/mediatek/mt8188/mt8188-mt6359.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
> b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
> index bc4b74970a46..ae02bbcd5d4e 100644
> --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
> +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
> @@ -594,7 +594,7 @@ static int mt8188_max98390_codec_init(struct
> snd_soc_pcm_runtime *rtd)
>  }
>  
>  if (rtd->dai_link->num_codecs <= 2)
> -return ret;
> +return -EINVAL;
>  
>  /* add widgets/controls/dapm for rear speakers */
>  ret = snd_soc_dapm_new_controls(&card->dapm,
> mt8188_rear_spk_widgets,
> -- 
> 2.39.2
> 
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ASoC: mediatek: mt8188-mt6359: Fix error code in codec_init

[Dan Carpenter]

On Wed, Jun 07, 2023 at 10:30:05AM +0000, Trevor Wu (吳文良) wrote:
> On Wed, 2023-06-07 at 12:41 +0300, Dan Carpenter wrote:
> >  Return -EINVAL on this error path instead of returning success.
> 
> Hi Dan,
> 
> I intended for the function to be reusable by both 2 and 4 amps, which
> is why I added a condition in the middle.
> This shouldn't be considered an error case, so there is no need to
> return -EINVAL here.
> Please kindly inform me if there are any errors in my understanding.

Oh, it looked like an error path.  Let me change it to "return 0;".

regards,
dan carpenter


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel