ALSA: snd_usb_caiaq: fix legacy input streaming
Daniel Mack [Wed, 17 Jun 2009 15:45:11 +0000 (17:45 +0200)]
Seems that nobody recently tried the input on the very first supported
sound card model, RK2. This patch fixes the byte offset to make it
running again.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/usb/caiaq/audio.c
sound/usb/caiaq/device.c

index b144513..8f9b60c 100644 (file)
@@ -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)
index 2240624..0e5db71 100644 (file)
@@ -35,7 +35,7 @@
 #include "input.h"
 
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.3.16");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.3.17");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
                         "{Native Instruments, RigKontrol3},"