diff options
author | Liam Girdwood <lrg@ti.com> | 2012-07-06 12:07:00 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-06 14:06:58 -0400 |
commit | 3ac3f5ca91afc03587b1d2d642f126efc5be37ca (patch) | |
tree | f7ed39b299d885b095b1e28e44eecb3676bbd22c /sound/soc/soc-pcm.c | |
parent | 3e4536546beb5295e6e0459e745327ebffeade9d (diff) |
ASoC: dpcm: Allow FE to be opened without valid BE routes.
Some userspace will open a PCM device and then configure mixers
for routing before triggering. This patch allows userspace to do
this sequence.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r-- | sound/soc/soc-pcm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 7063b8f926c6..ef22d0bd9e9e 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c | |||
@@ -1955,10 +1955,8 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) | |||
1955 | fe->dpcm[stream].runtime = fe_substream->runtime; | 1955 | fe->dpcm[stream].runtime = fe_substream->runtime; |
1956 | 1956 | ||
1957 | if (dpcm_path_get(fe, stream, &list) <= 0) { | 1957 | if (dpcm_path_get(fe, stream, &list) <= 0) { |
1958 | dev_warn(fe->dev, "asoc: %s no valid %s route\n", | 1958 | dev_dbg(fe->dev, "asoc: %s no valid %s route\n", |
1959 | fe->dai_link->name, stream ? "capture" : "playback"); | 1959 | fe->dai_link->name, stream ? "capture" : "playback"); |
1960 | mutex_unlock(&fe->card->mutex); | ||
1961 | return -EINVAL; | ||
1962 | } | 1960 | } |
1963 | 1961 | ||
1964 | /* calculate valid and active FE <-> BE dpcms */ | 1962 | /* calculate valid and active FE <-> BE dpcms */ |