diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-10 11:30:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-10 11:30:55 +0000 |
| commit | b25b1b6d72e15f0f19469e56fdb3576128cae22a (patch) | |
| tree | 5140d3971a17e50a53232f70a3c7e817b415da49 /sound | |
| parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
| parent | e4ad1accb28d0ed8cea6f12395d58686ad344ca7 (diff) | |
| download | linux-stable-b25b1b6d72e15f0f19469e56fdb3576128cae22a.tar.gz linux-stable-b25b1b6d72e15f0f19469e56fdb3576128cae22a.tar.bz2 linux-stable-b25b1b6d72e15f0f19469e56fdb3576128cae22a.zip | |
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-pcm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 47e1ce771e65..28522bd03b8e 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1989,6 +1989,7 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card) paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list); if (paths < 0) { + dpcm_path_put(&list); dev_warn(fe->dev, "ASoC: %s no valid %s path\n", fe->dai_link->name, "playback"); mutex_unlock(&card->mutex); @@ -2018,6 +2019,7 @@ capture: paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list); if (paths < 0) { + dpcm_path_put(&list); dev_warn(fe->dev, "ASoC: %s no valid %s path\n", fe->dai_link->name, "capture"); mutex_unlock(&card->mutex); @@ -2082,6 +2084,7 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) fe->dpcm[stream].runtime = fe_substream->runtime; if (dpcm_path_get(fe, stream, &list) <= 0) { + dpcm_path_put(&list); dev_dbg(fe->dev, "ASoC: %s no valid %s route\n", fe->dai_link->name, stream ? "capture" : "playback"); } |