[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5c531501-ecb9-3a04-fc67-ca3dabaff5bf@ti.com>
Date: Tue, 19 Sep 2017 09:10:16 +0300
From: Peter Ujfalusi <peter.ujfalusi@...com>
To: Christophe JAILLET <christophe.jaillet@...adoo.fr>,
<lgirdwood@...il.com>, <broonie@...nel.org>, <perex@...ex.cz>,
<tiwai@...e.com>
CC: <alsa-devel@...a-project.org>, <linux-kernel@...r.kernel.org>,
<kernel-janitors@...r.kernel.org>
Subject: Re: [PATCH] ASoC: davinci-mcasp: Fix an error handling path in
'davinci_mcasp_probe()'
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
On 2017-09-16 08:40, Christophe JAILLET wrote:
> All error handling paths in this function 'goto err' except this one.
>
> If one of the 2 previous memory allocations fails, we should go through
> the existing error handling path. Otherwise there is an unbalanced
> pm_runtime_enable()/pm_runtime_disable().
Acked-by: Peter Ujfalusi <peter.ujfalusi@...com>
> Fixes: dd55ff8346a9 ("ASoC: davinci-mcasp: Add set_tdm_slots() support")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
> ---
> sound/soc/davinci/davinci-mcasp.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
> index f395bbc7c354..23b0da7df1f2 100644
> --- a/sound/soc/davinci/davinci-mcasp.c
> +++ b/sound/soc/davinci/davinci-mcasp.c
> @@ -1982,8 +1982,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
> GFP_KERNEL);
>
> if (!mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list ||
> - !mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list)
> - return -ENOMEM;
> + !mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list) {
> + ret = -ENOMEM;
> + goto err;
> + }
>
> ret = davinci_mcasp_set_ch_constraints(mcasp);
> if (ret)
>
- Péter
Powered by blists - more mailing lists