diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-22 02:38:22 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-22 02:38:22 +0200 |
| commit | 94aca80897501f994c795cffc458ecd0404377c7 (patch) | |
| tree | 312f96755c4e7ab4c50766aea35c9e7aa2ebe015 /sound/soc/soc-pcm.c | |
| parent | Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso (diff) | |
| parent | x86, vdso: Fix an OOPS accessing the HPET mapping w/o an HPET (diff) | |
| download | linux-94aca80897501f994c795cffc458ecd0404377c7.tar.xz linux-94aca80897501f994c795cffc458ecd0404377c7.zip | |
Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso
Resolved Conflicts:
arch/x86/vdso/vdso32-setup.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2cedf09f6d96..a391de058037 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1675,7 +1675,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, be->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP; break; case SNDRV_PCM_TRIGGER_SUSPEND: - if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) + if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) continue; if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream)) |