* [PATCH v2] ASoC: soc-pcm: fix dpcm_path_get error handling @ 2014-09-10 9:54 Qiao Zhou 2014-09-10 9:54 ` Qiao Zhou 0 siblings, 1 reply; 4+ messages in thread From: Qiao Zhou @ 2014-09-10 9:54 UTC (permalink / raw) To: vinod.koul, lgirdwood, broonie, perex, tiwai, alsa-devel; +Cc: Qiao Zhou per Mark's suggestion, add braces to the else if branch Qiao Zhou (1): ASoC: soc-pcm: fix dpcm_path_get error handling sound/soc/soc-compress.c | 6 +++++- sound/soc/soc-pcm.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] ASoC: soc-pcm: fix dpcm_path_get error handling 2014-09-10 9:54 [PATCH v2] ASoC: soc-pcm: fix dpcm_path_get error handling Qiao Zhou @ 2014-09-10 9:54 ` Qiao Zhou 2014-09-10 10:33 ` Mark Brown 0 siblings, 1 reply; 4+ messages in thread From: Qiao Zhou @ 2014-09-10 9:54 UTC (permalink / raw) To: vinod.koul, lgirdwood, broonie, perex, tiwai, alsa-devel; +Cc: Qiao Zhou 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 | 6 +++++- sound/soc/soc-pcm.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 27c06ac..3092b58 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -101,7 +101,11 @@ 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"); } diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 731fdb5..642c862 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2352,7 +2352,11 @@ 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"); } -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ASoC: soc-pcm: fix dpcm_path_get error handling 2014-09-10 9:54 ` Qiao Zhou @ 2014-09-10 10:33 ` Mark Brown 2014-09-10 10:38 ` Qiao Zhou 0 siblings, 1 reply; 4+ messages in thread From: Mark Brown @ 2014-09-10 10:33 UTC (permalink / raw) To: Qiao Zhou; +Cc: vinod.koul, tiwai, alsa-devel, lgirdwood [-- Attachment #1.1: Type: text/plain, Size: 381 bytes --] On Wed, Sep 10, 2014 at 05:54:07PM +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. Applied, thanks. Please don't send cover letters for single patches - it's just more mail. If anything needs saying it should either go in the changelog or after the ---. [-- 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] 4+ messages in thread
* Re: [PATCH v2] ASoC: soc-pcm: fix dpcm_path_get error handling 2014-09-10 10:33 ` Mark Brown @ 2014-09-10 10:38 ` Qiao Zhou 0 siblings, 0 replies; 4+ messages in thread From: Qiao Zhou @ 2014-09-10 10:38 UTC (permalink / raw) To: Mark Brown Cc: vinod.koul@intel.com, tiwai@suse.de, alsa-devel@alsa-project.org, lgirdwood@gmail.com On 09/10/2014 06:33 PM, Mark Brown wrote: > On Wed, Sep 10, 2014 at 05:54:07PM +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. > > Applied, thanks. Please don't send cover letters for single patches - > it's just more mail. If anything needs saying it should either go in > the changelog or after the ---. > Mark, Thanks for the tips. I'll keep it in mind. -- Best Regards Qiao ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-10 10:38 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-09-10 9:54 [PATCH v2] ASoC: soc-pcm: fix dpcm_path_get error handling Qiao Zhou 2014-09-10 9:54 ` Qiao Zhou 2014-09-10 10:33 ` Mark Brown 2014-09-10 10:38 ` Qiao Zhou
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.