| Message ID | 20201102085436.14450-1-zhangqilong3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] ASoC: ti: davinci-mcasp: fix error handling in davinci_mcasp_probe | expand |
Hi > > Hi, > > On 02/11/2020 11.07, Peter Ujfalusi wrote: > > > > > > On 02/11/2020 10.54, Zhang Qilong wrote: > >> Forgetting to call pm_runtime_disable if davinci_mcasp_get_dt_params > >> failed in function davinci_mcasp_probe, and we should go to error > >> handling branch. > > > > Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > > Actually... > > > > >> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> > >> --- > >> Changelog: > >> V2 > >> - changed the subject and fixed the description. > >> --- > >> sound/soc/ti/davinci-mcasp.c | 6 ++++-- > >> 1 file changed, 4 insertions(+), 2 deletions(-) > >> > >> diff --git a/sound/soc/ti/davinci-mcasp.c > >> b/sound/soc/ti/davinci-mcasp.c index 4b46dd827f3f..ec90c23c9e20 > >> 100644 > >> --- a/sound/soc/ti/davinci-mcasp.c > >> +++ b/sound/soc/ti/davinci-mcasp.c > >> @@ -2362,8 +2362,10 @@ static int davinci_mcasp_probe(struct > platform_device *pdev) > >> goto err; > >> > >> ret = davinci_mcasp_get_dt_params(mcasp); > >> - if (ret) > >> - return -EINVAL; > >> + if (ret) { > >> + ret = -EINVAL; > >> + goto err; > > do not override the error code from davinci_mcasp_get_dt_params(), jut jump > to err. > I have ever thought this point. I can't make sure it's necessary, davinci_mcasp_get_dt_params always return 0 now. If it's necessary, I can submit a new patch to fix it. Look forward to your reply sincerely. Thanks, best wish! Zhang Qilong > >> + } > >> > >> ret = devm_snd_soc_register_component(&pdev->dev, > >> &davinci_mcasp_component, > >> > > > > - Péter > > > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > > > > - Péter > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 4b46dd827f3f..ec90c23c9e20 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -2362,8 +2362,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) goto err; ret = davinci_mcasp_get_dt_params(mcasp); - if (ret) - return -EINVAL; + if (ret) { + ret = -EINVAL; + goto err; + } ret = devm_snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
Forgetting to call pm_runtime_disable if davinci_mcasp_get_dt_params failed in function davinci_mcasp_probe, and we should go to error handling branch. Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> --- Changelog: V2 - changed the subject and fixed the description. --- sound/soc/ti/davinci-mcasp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)