diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-21 22:13:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-21 22:13:08 +0200 |
| commit | 413318444fd5351f9858b9deb4e8ecaf8898ee05 (patch) | |
| tree | c5ab72670ca792c800ca6c75e534c96df2cb80c7 /sound/usb/caiaq/audio.c | |
| parent | Move FAULT_FLAG_xyz into handle_mm_fault() callers (diff) | |
| parent | Merge branch 'topic/hda' into for-linus (diff) | |
| download | linux-413318444fd5351f9858b9deb4e8ecaf8898ee05.tar.xz linux-413318444fd5351f9858b9deb4e8ecaf8898ee05.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Add model=6530g option
ALSA: hda - Acer Inspire 6530G model for Realtek ALC888
ALSA: snd_usb_caiaq: fix legacy input streaming
ASoC: Kill BUS_ID_SIZE
ALSA: HDA - Correct trivial typos in comments.
ALSA: HDA - Name-fixes in code (tagra/targa)
ALSA: HDA - Add pci-quirk for MSI MS-7350 motherboard.
ALSA: hda - Fix memory leak at codec creation
Diffstat (limited to 'sound/usb/caiaq/audio.c')
| -rw-r--r-- | sound/usb/caiaq/audio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c index b14451342166..8f9b60c5d74c 100644 --- a/sound/usb/caiaq/audio.c +++ b/sound/usb/caiaq/audio.c @@ -199,8 +199,9 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) dev->period_out_count[index] = BYTES_PER_SAMPLE + 1; dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1; } else { - dev->period_in_count[index] = BYTES_PER_SAMPLE; - dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE; + int in_pos = (dev->spec.data_alignment == 2) ? 0 : 2; + dev->period_in_count[index] = BYTES_PER_SAMPLE + in_pos; + dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE + in_pos; } if (dev->streaming) |