diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-26 22:26:09 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-26 22:26:09 +0300 |
| commit | d61b04f801e6005182d432ebe4a0211c1d6feadd (patch) | |
| tree | aa085e56e1be528917212f41c485eebdfc072930 /sound/soc/soc-pcm.c | |
| parent | 30ff5957c3f1887d04ca01d839dc382739e48bde (diff) | |
| parent | 473f414564528a819f0c2bb6b4bf26366b64c9ab (diff) | |
| download | linux-d61b04f801e6005182d432ebe4a0211c1d6feadd.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e898b427be7e..1af4f23697a7 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1810,7 +1810,8 @@ int dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream) (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED) && - (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP)) + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) && + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND)) continue; dev_dbg(be->dev, "ASoC: hw_free BE %s\n", |