diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-21 19:03:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-21 19:03:22 +0200 |
| commit | 44f167d376aa42d59d40406036e901a5cf03567f (patch) | |
| tree | 6ba4b322481ee5ddbc81ad23a42d6f2ca902855e /sound/pci | |
| parent | a9d90c81b536cc0567bdf22a8aaefe180a5b0f7a (diff) | |
| parent | 34fdeb2d07102e07ecafe79dec170bd6733f2e56 (diff) | |
Merge branch 'fix/misc' into for-linus
* fix/misc:
ALSA: ca0106 - Fix the max capture buffer size
ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index f24bf1ecb36..15e4138bce1 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c @@ -325,9 +325,9 @@ static struct snd_pcm_hardware snd_ca0106_capture_hw = { .rate_max = 192000, .channels_min = 2, .channels_max = 2, - .buffer_bytes_max = ((65536 - 64) * 8), + .buffer_bytes_max = 65536 - 128, .period_bytes_min = 64, - .period_bytes_max = (65536 - 64), + .period_bytes_max = 32768 - 64, .periods_min = 2, .periods_max = 2, .fifo_size = 0, |