diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-11-22 08:11:10 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-11-22 08:11:10 +0100 |
commit | d2b88e4c103f37584dc81ef8a41ca584c1ce847b (patch) | |
tree | 247ac000bec902fcc580757d236caa053755ea27 /sound/core | |
parent | ALSA: oxygen: add HiFier Serenade support (diff) | |
parent | ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J (diff) | |
download | linux-d2b88e4c103f37584dc81ef8a41ca584c1ce847b.tar.xz linux-d2b88e4c103f37584dc81ef8a41ca584c1ce847b.zip |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/pcm_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index a1707cca9c66..b75db8e9cc0f 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -223,7 +223,7 @@ static void xrun_log(struct snd_pcm_substream *substream, entry->jiffies = jiffies; entry->pos = pos; entry->period_size = runtime->period_size; - entry->buffer_size = runtime->buffer_size;; + entry->buffer_size = runtime->buffer_size; entry->old_hw_ptr = runtime->status->hw_ptr; entry->hw_ptr_base = runtime->hw_ptr_base; log->idx = (log->idx + 1) % XRUN_LOG_CNT; |