UBUNTU: alsa: caiaq: correct input channel order OriginalAuthor: Dabiel Mack
 

This patch corrects the input channel order of hardware supported by
snd_usb_caiaq.

Signed-off-by: Daniel Mack <daniel@caiaq.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c | 2 +-
ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c b/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c
index 1aa9279..ebf3281 100644
--- a/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c
+++ b/ubuntu/sound/alsa-kernel/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/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c b/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c
index bd9d423..4dc5cdd 100644
--- a/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c
+++ b/ubuntu/sound/alsa-kernel/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},"
--
1.5.4.3


--------------080505070703000409060509
Content-Type: text/x-diff;
name="0002-UBUNTU-alsa-caiaq-make-high-sample-rates-work-wit.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename*0="0002-UBUNTU-alsa-caiaq-make-high-sample-rates-work-wit.patch"