aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/pcm_native.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-01-26 18:13:04 +0100
committerTakashi Iwai <tiwai@suse.de>2010-01-26 18:13:04 +0100
commitd0d2c38e3963f4f86a9e62d74f45a371458f2787 (patch)
tree8ab868d67fcd4151e9b7a8158edc0cb2e1a19f66 /sound/core/pcm_native.c
parentcf944ee55cc318bdb1d4b2f3f5cce3257f7c07b3 (diff)
parente7636925789b042ff9d98c51d48392e8c5549480 (diff)
downloadkernel_samsung_smdk4412-d0d2c38e3963f4f86a9e62d74f45a371458f2787.zip
kernel_samsung_smdk4412-d0d2c38e3963f4f86a9e62d74f45a371458f2787.tar.gz
kernel_samsung_smdk4412-d0d2c38e3963f4f86a9e62d74f45a371458f2787.tar.bz2
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/core/pcm_native.c')
-rw-r--r--sound/core/pcm_native.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index b53fa84..b79c777 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1252,6 +1252,8 @@ static int snd_pcm_do_reset(struct snd_pcm_substream *substream, int state)
if (err < 0)
return err;
runtime->hw_ptr_base = 0;
+ runtime->hw_ptr_interrupt = runtime->status->hw_ptr -
+ runtime->status->hw_ptr % runtime->period_size;
runtime->silence_start = runtime->status->hw_ptr;
runtime->silence_filled = 0;
return 0;