aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/usb/caiaq/caiaq-audio.c4
-rw-r--r--sound/usb/caiaq/caiaq-device.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index fc6d571eeac6..577b1129de0e 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)
114 dev->output_panic = 0; 114 dev->output_panic = 0;
115 dev->first_packet = 1; 115 dev->first_packet = 1;
116 dev->streaming = 1; 116 dev->streaming = 1;
117 dev->warned = 0;
117 118
118 for (i = 0; i < N_URBS; i++) { 119 for (i = 0; i < N_URBS; i++) {
119 ret = usb_submit_urb(dev->data_urbs_in[i], GFP_ATOMIC); 120 ret = usb_submit_urb(dev->data_urbs_in[i], GFP_ATOMIC);
@@ -406,10 +407,11 @@ static void read_in_urb(struct snd_usb_caiaqdev *dev,
406 break; 407 break;
407 } 408 }
408 409
409 if (dev->input_panic || dev->output_panic) { 410 if ((dev->input_panic || dev->output_panic) && !dev->warned) {
410 debug("streaming error detected %s %s\n", 411 debug("streaming error detected %s %s\n",
411 dev->input_panic ? "(input)" : "", 412 dev->input_panic ? "(input)" : "",
412 dev->output_panic ? "(output)" : ""); 413 dev->output_panic ? "(output)" : "");
414 dev->warned = 1;
413 } 415 }
414} 416}
415 417
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h
index 0560c327d996..098b194f7259 100644
--- a/sound/usb/caiaq/caiaq-device.h
+++ b/sound/usb/caiaq/caiaq-device.h
@@ -89,7 +89,7 @@ struct snd_usb_caiaqdev {
89 int audio_out_buf_pos[MAX_STREAMS]; 89 int audio_out_buf_pos[MAX_STREAMS];
90 int period_in_count[MAX_STREAMS]; 90 int period_in_count[MAX_STREAMS];
91 int period_out_count[MAX_STREAMS]; 91 int period_out_count[MAX_STREAMS];
92 int input_panic, output_panic; 92 int input_panic, output_panic, warned;
93 char *audio_in_buf, *audio_out_buf; 93 char *audio_in_buf, *audio_out_buf;
94 unsigned int samplerates; 94 unsigned int samplerates;
95 95