summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2008-04-14 15:39:47 +0200
committerTakashi Iwai <tiwai@suse.de>2008-04-24 12:00:36 +0200
commit6849d49c48718def95cf1b74154b9b0aee617c7e (patch)
tree367908a23582cc50a4c7c5c2ed01f8a5dbba0448
parent[ALSA] snd_usb_caiaq: fix potential lockups locking (diff)
downloadlinux-6849d49c48718def95cf1b74154b9b0aee617c7e.tar.xz
linux-6849d49c48718def95cf1b74154b9b0aee617c7e.zip
[ALSA] snd_usb_caiaq: correct input channel order
This patch corrects the input channel order of hardware supported by snd_usb_caiaq. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/caiaq/caiaq-audio.c2
-rw-r--r--sound/usb/caiaq/caiaq-device.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index 1aa927942cc6..ebf32818a16d 100644
--- a/sound/usb/caiaq/caiaq-audio.c
+++ b/sound/usb/caiaq/caiaq-audio.c
@@ -202,7 +202,7 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1;
else
- dev->audio_in_buf_pos[index] = 0;
+ dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE;
if (dev->streaming)
return 0;
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index 73c08b40cc5f..379e6082756f 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -42,7 +42,7 @@
#endif
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.3.4");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.3.5");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3},"