diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/pci/ymfpci | |
parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/ymfpci')
-rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 90d0d62bd0b4..2f0925236a1b 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
@@ -318,7 +318,12 @@ static void snd_ymfpci_pcm_interrupt(struct snd_ymfpci *chip, struct snd_ymfpci_ | |||
318 | ypcm->period_pos += delta; | 318 | ypcm->period_pos += delta; |
319 | ypcm->last_pos = pos; | 319 | ypcm->last_pos = pos; |
320 | if (ypcm->period_pos >= ypcm->period_size) { | 320 | if (ypcm->period_pos >= ypcm->period_size) { |
321 | // printk("done - active_bank = 0x%x, start = 0x%x\n", chip->active_bank, voice->bank[chip->active_bank].start); | 321 | /* |
322 | printk(KERN_DEBUG | ||
323 | "done - active_bank = 0x%x, start = 0x%x\n", | ||
324 | chip->active_bank, | ||
325 | voice->bank[chip->active_bank].start); | ||
326 | */ | ||
322 | ypcm->period_pos %= ypcm->period_size; | 327 | ypcm->period_pos %= ypcm->period_size; |
323 | spin_unlock(&chip->reg_lock); | 328 | spin_unlock(&chip->reg_lock); |
324 | snd_pcm_period_elapsed(ypcm->substream); | 329 | snd_pcm_period_elapsed(ypcm->substream); |
@@ -366,7 +371,12 @@ static void snd_ymfpci_pcm_capture_interrupt(struct snd_pcm_substream *substream | |||
366 | ypcm->last_pos = pos; | 371 | ypcm->last_pos = pos; |
367 | if (ypcm->period_pos >= ypcm->period_size) { | 372 | if (ypcm->period_pos >= ypcm->period_size) { |
368 | ypcm->period_pos %= ypcm->period_size; | 373 | ypcm->period_pos %= ypcm->period_size; |
369 | // printk("done - active_bank = 0x%x, start = 0x%x\n", chip->active_bank, voice->bank[chip->active_bank].start); | 374 | /* |
375 | printk(KERN_DEBUG | ||
376 | "done - active_bank = 0x%x, start = 0x%x\n", | ||
377 | chip->active_bank, | ||
378 | voice->bank[chip->active_bank].start); | ||
379 | */ | ||
370 | spin_unlock(&chip->reg_lock); | 380 | spin_unlock(&chip->reg_lock); |
371 | snd_pcm_period_elapsed(substream); | 381 | snd_pcm_period_elapsed(substream); |
372 | spin_lock(&chip->reg_lock); | 382 | spin_lock(&chip->reg_lock); |