[alsa-devel] [PATCH] ASoC: soc-pcm: fix dpcm_path_get error handling

Mark Brown broonie at kernel.org
Wed Sep 10 11:41:08 CEST 2014


On Wed, Sep 10, 2014 at 03:57:32PM +0800, Qiao Zhou wrote:
> dpcm_path_get may return -ENOMEM when allocating memory for list
> fails. We should not keep processing path or start up dpcm dai in
> this case.
> 
> Signed-off-by: Qiao Zhou <zhouqiao at marvell.com>
> ---
>  sound/soc/soc-compress.c |    7 +++++--
>  sound/soc/soc-pcm.c      |    7 +++++--
>  2 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> index 27c06ac..b969a13 100644
> --- a/sound/soc/soc-compress.c
> +++ b/sound/soc/soc-compress.c
> @@ -101,10 +101,13 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
>  
> +	ret = dpcm_path_get(fe, stream, &list);
> +	if (ret < 0) {
> +		mutex_unlock(&fe->card->mutex);
> +		goto fe_err;
> +	} else if (ret == 0)
>  		dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
>  			fe->dai_link->name, stream ? "capture" : "playback");
> -	}

If one side of an if statement has braces both sides should have braces.

Otherwise this looks good.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20140910/86b02743/attachment.sig>


More information about the Alsa-devel mailing list