diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-25 17:21:56 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-25 17:21:56 -0400 |
commit | 758fc06da3db6d2e52d8fa4028780f2486e4dfb7 (patch) | |
tree | 670ce4acbf606d8b89edce7cd929c81f8939e855 /sound | |
parent | b098d6726bbfb94c06d6e1097466187afddae61f (diff) | |
parent | 017d9491ce203c620ad1377f46a3ce78d554b2de (diff) |
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) | |||
1989 | 1989 | ||
1990 | paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list); | 1990 | paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list); |
1991 | if (paths < 0) { | 1991 | if (paths < 0) { |
1992 | dpcm_path_put(&list); | ||
1993 | dev_warn(fe->dev, "ASoC: %s no valid %s path\n", | 1992 | dev_warn(fe->dev, "ASoC: %s no valid %s path\n", |
1994 | fe->dai_link->name, "playback"); | 1993 | fe->dai_link->name, "playback"); |
1995 | mutex_unlock(&card->mutex); | 1994 | mutex_unlock(&card->mutex); |
@@ -2019,7 +2018,6 @@ capture: | |||
2019 | 2018 | ||
2020 | paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list); | 2019 | paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list); |
2021 | if (paths < 0) { | 2020 | if (paths < 0) { |
2022 | dpcm_path_put(&list); | ||
2023 | dev_warn(fe->dev, "ASoC: %s no valid %s path\n", | 2021 | dev_warn(fe->dev, "ASoC: %s no valid %s path\n", |
2024 | fe->dai_link->name, "capture"); | 2022 | fe->dai_link->name, "capture"); |
2025 | mutex_unlock(&card->mutex); | 2023 | mutex_unlock(&card->mutex); |
@@ -2084,7 +2082,6 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) | |||
2084 | fe->dpcm[stream].runtime = fe_substream->runtime; | 2082 | fe->dpcm[stream].runtime = fe_substream->runtime; |
2085 | 2083 | ||
2086 | if (dpcm_path_get(fe, stream, &list) <= 0) { | 2084 | if (dpcm_path_get(fe, stream, &list) <= 0) { |
2087 | dpcm_path_put(&list); | ||
2088 | dev_dbg(fe->dev, "ASoC: %s no valid %s route\n", | 2085 | dev_dbg(fe->dev, "ASoC: %s no valid %s route\n", |
2089 | fe->dai_link->name, stream ? "capture" : "playback"); | 2086 | fe->dai_link->name, stream ? "capture" : "playback"); |
2090 | } | 2087 | } |