diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-17 16:45:39 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-17 16:45:39 -0400 |
| commit | 1b6c03df8d82f95d15e5ef224edc873a0df1a440 (patch) | |
| tree | fb456177dcc7d1607695532c3cdda77f4a885306 | |
| parent | e122b3aec7f2d52e429caf9a07a3a99cf1429dce (diff) | |
| parent | 7ed9de76ff342cbd717a9cf897044b99272cb8f8 (diff) | |
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
| -rw-r--r-- | sound/soc/soc-pcm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 54d18f22a33e..4ea656770d65 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c | |||
| @@ -2069,6 +2069,7 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card) | |||
| 2069 | dpcm_be_disconnect(fe, SNDRV_PCM_STREAM_PLAYBACK); | 2069 | dpcm_be_disconnect(fe, SNDRV_PCM_STREAM_PLAYBACK); |
| 2070 | } | 2070 | } |
| 2071 | 2071 | ||
| 2072 | dpcm_path_put(&list); | ||
| 2072 | capture: | 2073 | capture: |
| 2073 | /* skip if FE doesn't have capture capability */ | 2074 | /* skip if FE doesn't have capture capability */ |
| 2074 | if (!fe->cpu_dai->driver->capture.channels_min) | 2075 | if (!fe->cpu_dai->driver->capture.channels_min) |