From 49ae3ac177d6ae66b55a02537e18aba458a47c08 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 23 Nov 2012 14:28:42 +0100 Subject: [PATCH] --- yaml --- r: 342620 b: refs/heads/master c: 3f94fad09538ec988919ec3f371841182df71d04 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/usb/pcm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fed25cd9d7c1..dbaaf05fc565 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffe4d12b151018e831f0ca2e05fe78a55238c517 +refs/heads/master: 3f94fad09538ec988919ec3f371841182df71d04 diff --git a/trunk/sound/usb/pcm.c b/trunk/sound/usb/pcm.c index e919c2e40fa0..8e1d5e00c182 100644 --- a/trunk/sound/usb/pcm.c +++ b/trunk/sound/usb/pcm.c @@ -75,7 +75,8 @@ static snd_pcm_uframes_t snd_usb_pcm_pointer(struct snd_pcm_substream *substream return SNDRV_PCM_POS_XRUN; spin_lock(&subs->lock); hwptr_done = subs->hwptr_done; - substream->runtime->delay = snd_usb_pcm_delay(subs, + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + substream->runtime->delay = snd_usb_pcm_delay(subs, substream->runtime->rate); spin_unlock(&subs->lock); return hwptr_done / (substream->runtime->frame_bits >> 3);