summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-25 21:21:56 +0000
committerMark Brown <broonie@linaro.org>2014-03-25 21:21:56 +0000
commit758fc06da3db6d2e52d8fa4028780f2486e4dfb7 (patch)
tree670ce4acbf606d8b89edce7cd929c81f8939e855 /sound
parentb098d6726bbfb94c06d6e1097466187afddae61f (diff)
parent017d9491ce203c620ad1377f46a3ce78d554b2de (diff)
downloadlinux-758fc06da3db6d2e52d8fa4028780f2486e4dfb7.tar.gz
linux-758fc06da3db6d2e52d8fa4028780f2486e4dfb7.tar.bz2
linux-758fc06da3db6d2e52d8fa4028780f2486e4dfb7.zip
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-pcm.c3
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");
}