summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-21 10:59:10 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-21 10:59:10 +0200
commit0b6306f69f1857f8883cbd81a5f60393db6a08fc (patch)
treeb3ff0b0760033c4329aa8d23f1adfd921a5a3455 /sound
parent9fd0d96e799ef96f1394cbb67abc2a2e2b714ddc (diff)
parent0a842c8b60411e200b8a44b65dd78d9665692b91 (diff)
downloadlinux-3.10-0b6306f69f1857f8883cbd81a5f60393db6a08fc.tar.gz
linux-3.10-0b6306f69f1857f8883cbd81a5f60393db6a08fc.tar.bz2
linux-3.10-0b6306f69f1857f8883cbd81a5f60393db6a08fc.zip
Merge branch 'topic/caiaq' into for-linus
* topic/caiaq: ALSA: snd_usb_caiaq: fix legacy input streaming
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/caiaq/audio.c5
-rw-r--r--sound/usb/caiaq/device.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index b1445134216..8f9b60c5d74 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)
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index 22406245a98..0e5db719de2 100644
--- 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},"