diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-25 22:21:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-25 22:21:56 +0100 |
| commit | 758fc06da3db6d2e52d8fa4028780f2486e4dfb7 (patch) | |
| tree | 670ce4acbf606d8b89edce7cd929c81f8939e855 /sound | |
| parent | Linux 3.14-rc8 (diff) | |
| parent | ASoC: pcm: Drop incorrect double/extra frees (diff) | |
| download | linux-758fc06da3db6d2e52d8fa4028780f2486e4dfb7.tar.xz linux-758fc06da3db6d2e52d8fa4028780f2486e4dfb7.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, 0 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 28522bd03b8e..47e1ce771e65 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1989,7 +1989,6 @@ 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); @@ -2019,7 +2018,6 @@ 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); @@ -2084,7 +2082,6 @@ 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"); } |