diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-03-18 11:03:53 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-18 11:27:51 +0100 |
commit | 1313e7041480f523a09dedc7ef2185d8ee94c163 (patch) | |
tree | 76863f228d5ef6cc6d727bd91ef1483a067fbe6c /sound/usb | |
parent | 238c0270baade3a542c1497712dd8e66cc9cc476 (diff) | |
download | kernel_samsung_smdk4412-1313e7041480f523a09dedc7ef2185d8ee94c163.zip kernel_samsung_smdk4412-1313e7041480f523a09dedc7ef2185d8ee94c163.tar.gz kernel_samsung_smdk4412-1313e7041480f523a09dedc7ef2185d8ee94c163.tar.bz2 |
ALSA: snd-usb-caiaq: only warn once on streaming errors
Limit the number of printed warnings to one in case of streaming errors.
printk() happens to be expensive, especially in code called as often as
here.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/caiaq/caiaq-audio.c | 4 | ||||
-rw-r--r-- | sound/usb/caiaq/caiaq-device.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c index fc6d571..577b112 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); @@ -406,10 +407,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; } } diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h index 0560c32..098b194 100644 --- a/sound/usb/caiaq/caiaq-device.h +++ b/sound/usb/caiaq/caiaq-device.h @@ -89,7 +89,7 @@ struct snd_usb_caiaqdev { int audio_out_buf_pos[MAX_STREAMS]; int period_in_count[MAX_STREAMS]; int period_out_count[MAX_STREAMS]; - int input_panic, output_panic; + int input_panic, output_panic, warned; char *audio_in_buf, *audio_out_buf; unsigned int samplerates; |