2 files changed, 7 insertions, 3 deletions

diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index ebf32818a16d..24970a5c888f 100644
--- a/sound/usb/caiaq/caiaq-audio.c
+++ b/sound/usb/caiaq/caiaq-audio.c
@@ -39,7 +39,8 @@
 #define BYTES_PER_SAMPLE        3
 #define BYTES_PER_SAMPLE_USB    4
 #define MAX_BUFFER_SIZE         (128*1024)
-                                 
+#define MAX_ENDPOINT_SIZE       512
+
 #define ENDPOINT_CAPTURE        2
 #define ENDPOINT_PLAYBACK       6
 
@@ -221,7 +222,10 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
         
         bpp = ((runtime->rate / 8000) + CLOCK_DRIFT_TOLERANCE)
                 * bytes_per_sample * CHANNELS_PER_STREAM * dev->n_streams;
-        
+
+        if (bpp > MAX_ENDPOINT_SIZE)
+                bpp = MAX_ENDPOINT_SIZE;
+
         ret = snd_usb_caiaq_set_audio_params(dev, runtime->rate,
                                              runtime->sample_bits, bpp);
         if (ret)
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index 379e6082756f..e97d8b2ac16a 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.5");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.3.6");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
                          "{Native Instruments, RigKontrol3},"