From 28362ae3913a6a8b2b9e923b8a138f337a138fdf Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 4 Feb 2013 10:28:15 +0100 Subject: [PATCH] --- yaml --- r: 353239 b: refs/heads/master c: edac894389f9c9de2a1368c78809c824b343f3a5 h: refs/heads/master i: 353237: 2b145cef83bbd77fa7fe17c48ea69a549e5f47be 353235: 63a9458b43351af6f1083bcc852bc5bb9fb0afd4 353231: ed1da83bccfc01acb985e818a2365cfebc190292 v: v3 --- [refs] | 2 +- trunk/sound/drivers/aloop.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 306d6ee09265..072ff90e89a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20608731f479d48be6bcb88e727f360ddf98ddaf +refs/heads/master: edac894389f9c9de2a1368c78809c824b343f3a5 diff --git a/trunk/sound/drivers/aloop.c b/trunk/sound/drivers/aloop.c index 3d822328d383..64d534710b51 100644 --- a/trunk/sound/drivers/aloop.c +++ b/trunk/sound/drivers/aloop.c @@ -286,12 +286,14 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) loopback_active_notify(dpcm); break; case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + case SNDRV_PCM_TRIGGER_SUSPEND: spin_lock(&cable->lock); cable->pause |= stream; loopback_timer_stop(dpcm); spin_unlock(&cable->lock); break; case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_RESUME: spin_lock(&cable->lock); dpcm->last_jiffies = jiffies; cable->pause &= ~stream; @@ -563,7 +565,8 @@ static snd_pcm_uframes_t loopback_pointer(struct snd_pcm_substream *substream) static struct snd_pcm_hardware loopback_pcm_hardware = { .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE), + SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME), .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE | SNDRV_PCM_FMTBIT_FLOAT_LE | SNDRV_PCM_FMTBIT_FLOAT_BE),