ALSA: snd_usb_caiaq: fix legacy input streaming

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>

diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index b14451342166a7630b820731d131b0536e71b9bd..8f9b60c5d74c9714e13c58a8bf4590b9e727951d 100644 (file)
--- 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)

diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index 22406245a98bb9a4a105161e2eceb44d13e44418..0e5db719de244c1ba6da224ac316b8a37106109c 100644 (file)
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -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},"