* [PATCH] ASoC: soc-pcm: fix dpcm_path_get error handling
@ 2014-09-10 7:57 Qiao Zhou
2014-09-10 8:02 ` Vinod Koul
2014-09-10 9:41 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Qiao Zhou @ 2014-09-10 7:57 UTC (permalink / raw)
To: vinod.koul, lgirdwood, broonie, perex, tiwai, alsa-devel,
zhouqiao
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@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)
fe->dpcm[stream].runtime = fe_substream->runtime;
- if (dpcm_path_get(fe, stream, &list) <= 0) {
+ 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");
- }
/* calculate valid and active FE <-> BE dpcms */
dpcm_process_paths(fe, stream, &list, 1);
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 731fdb5..d341777 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2352,10 +2352,13 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)
mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
fe->dpcm[stream].runtime = fe_substream->runtime;
- if (dpcm_path_get(fe, stream, &list) <= 0) {
+ ret = dpcm_path_get(fe, stream, &list);
+ if (ret < 0) {
+ mutex_unlock(&fe->card->mutex);
+ return ret;
+ } else if (ret == 0)
dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
fe->dai_link->name, stream ? "capture" : "playback");
- }
/* calculate valid and active FE <-> BE dpcms */
dpcm_process_paths(fe, stream, &list, 1);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: soc-pcm: fix dpcm_path_get error handling
2014-09-10 7:57 [PATCH] ASoC: soc-pcm: fix dpcm_path_get error handling Qiao Zhou
@ 2014-09-10 8:02 ` Vinod Koul
2014-09-10 9:41 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2014-09-10 8:02 UTC (permalink / raw)
To: Qiao Zhou; +Cc: tiwai, alsa-devel, broonie, lgirdwood
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@marvell.com>
> ---
> sound/soc/soc-compress.c | 7 +++++--
For this:
Acked-by: Vinod Koul <vinod.koul@intel.com>
--
~Vinod
> 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)
>
> fe->dpcm[stream].runtime = fe_substream->runtime;
>
> - if (dpcm_path_get(fe, stream, &list) <= 0) {
> + 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");
> - }
>
> /* calculate valid and active FE <-> BE dpcms */
> dpcm_process_paths(fe, stream, &list, 1);
> diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
> index 731fdb5..d341777 100644
> --- a/sound/soc/soc-pcm.c
> +++ b/sound/soc/soc-pcm.c
> @@ -2352,10 +2352,13 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)
> mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
> fe->dpcm[stream].runtime = fe_substream->runtime;
>
> - if (dpcm_path_get(fe, stream, &list) <= 0) {
> + ret = dpcm_path_get(fe, stream, &list);
> + if (ret < 0) {
> + mutex_unlock(&fe->card->mutex);
> + return ret;
> + } else if (ret == 0)
> dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
> fe->dai_link->name, stream ? "capture" : "playback");
> - }
>
> /* calculate valid and active FE <-> BE dpcms */
> dpcm_process_paths(fe, stream, &list, 1);
> --
> 1.7.0.4
>
--
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: soc-pcm: fix dpcm_path_get error handling
2014-09-10 7:57 [PATCH] ASoC: soc-pcm: fix dpcm_path_get error handling Qiao Zhou
2014-09-10 8:02 ` Vinod Koul
@ 2014-09-10 9:41 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2014-09-10 9:41 UTC (permalink / raw)
To: Qiao Zhou; +Cc: vinod.koul, tiwai, alsa-devel, lgirdwood
[-- Attachment #1.1: Type: text/plain, Size: 1058 bytes --]
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@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.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-10 9:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-10 7:57 [PATCH] ASoC: soc-pcm: fix dpcm_path_get error handling Qiao Zhou
2014-09-10 8:02 ` Vinod Koul
2014-09-10 9:41 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.