1 files changed, 12 insertions, 3 deletions

diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index b3a603325835..08d51e0c9fea 100644
--- a/sound/usb/caiaq/caiaq-audio.c
+++ b/sound/usb/caiaq/caiaq-audio.c
@@ -114,6 +114,7 @@ static int stream_start(struct snd_usb_caiaqdev *dev)
         dev->output_panic = 0;
         dev->first_packet = 1;
         dev->streaming = 1;
+        dev->warned = 0;
 
         for (i = 0; i < N_URBS; i++) {
                 ret = usb_submit_urb(dev->data_urbs_in[i], GFP_ATOMIC);
@@ -376,6 +377,9 @@ static void read_in_urb_mode2(struct snd_usb_caiaqdev *dev,
 
                 for (stream = 0; stream < dev->n_streams; stream++, i++) {
                         sub = dev->sub_capture[stream];
+                        if (dev->input_panic)
+                                usb_buf[i] = 0;
+
                         if (sub) {
                                 struct snd_pcm_runtime *rt = sub->runtime;
                                 char *audio_buf = rt->dma_area;
@@ -397,6 +401,9 @@ static void read_in_urb(struct snd_usb_caiaqdev *dev,
         if (!dev->streaming)
                 return;
 
+        if (iso->actual_length < dev->bpp)
+                return;
+
         switch (dev->spec.data_alignment) {
         case 0:
                 read_in_urb_mode0(dev, urb, iso);
@@ -406,10 +413,11 @@ static void read_in_urb(struct snd_usb_caiaqdev *dev,
                 break;
         }
 
-        if (dev->input_panic || dev->output_panic) {
+        if ((dev->input_panic || dev->output_panic) && !dev->warned) {
                 debug("streaming error detected %s %s\n", 
                                 dev->input_panic ? "(input)" : "",
                                 dev->output_panic ? "(output)" : "");
+                dev->warned = 1;
         }
 }
 
@@ -638,9 +646,10 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_SESSIONIO):
-                dev->samplerates |= SNDRV_PCM_RATE_88200;
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_GUITARRIGMOBILE):
                 dev->samplerates |= SNDRV_PCM_RATE_192000;
-                break;
+                /* fall thru */
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
                 dev->samplerates |= SNDRV_PCM_RATE_88200;
                 break;