3 files changed, 9 insertions, 1 deletions

diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index 577b1129de0e..08d51e0c9fea 100644
--- a/sound/usb/caiaq/caiaq-audio.c
+++ b/sound/usb/caiaq/caiaq-audio.c
@@ -377,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;
@@ -398,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);
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index 5736669df2d5..336a93de0b30 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -251,6 +251,8 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
                 
         if (dev->audio_parm_answer != 1) 
                 debug("unable to set the device's audio params\n");
+        else
+                dev->bpp = bpp;
 
         return dev->audio_parm_answer == 1 ? 0 : -EINVAL;
 }
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h
index 098b194f7259..4cce1ad7493d 100644
--- a/sound/usb/caiaq/caiaq-device.h
+++ b/sound/usb/caiaq/caiaq-device.h
@@ -91,7 +91,7 @@ struct snd_usb_caiaqdev {
         int period_out_count[MAX_STREAMS];
         int input_panic, output_panic, warned;
         char *audio_in_buf, *audio_out_buf;
-        unsigned int samplerates;
+        unsigned int samplerates, bpp;
 
         struct snd_pcm_substream *sub_playback[MAX_STREAMS];
         struct snd_pcm_substream *sub_capture[MAX_STREAMS];