aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/endpoint.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-09 11:37:20 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 16:13:09 -0800
commitb4133832cf270a39c961edf9777d2187eb2b7977 (patch)
tree3fe16c2a822c8ec091a95e80a9765dc8fa9f7040 /sound/usb/endpoint.c
parent662a1ccf42d1a08b9fb8d5709c19748bb40e88e1 (diff)
downloadkernel_samsung_smdk4412-b4133832cf270a39c961edf9777d2187eb2b7977.zip
kernel_samsung_smdk4412-b4133832cf270a39c961edf9777d2187eb2b7977.tar.gz
kernel_samsung_smdk4412-b4133832cf270a39c961edf9777d2187eb2b7977.tar.bz2
ALSA: usb-audio - Avoid flood of frame-active debug messages
commit 80c8a2a372599e604b04a9c568952fe39cd1851d upstream. With some buggy devices, the usb-audio driver may give "frame xxx active" kernel messages too often. Better to keep it as debug-only using snd_printdd(), and also add the rate-limit for avoiding floods. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=738681 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/usb/endpoint.c')
-rw-r--r--sound/usb/endpoint.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 81c6ede..08dcce5 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -17,6 +17,7 @@
#include <linux/gfp.h>
#include <linux/init.h>
+#include <linux/ratelimit.h>
#include <linux/usb.h>
#include <linux/usb/audio.h>
@@ -458,8 +459,8 @@ static int retire_capture_urb(struct snd_usb_substream *subs,
for (i = 0; i < urb->number_of_packets; i++) {
cp = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
- if (urb->iso_frame_desc[i].status) {
- snd_printd(KERN_ERR "frame %d active: %d\n", i, urb->iso_frame_desc[i].status);
+ if (urb->iso_frame_desc[i].status && printk_ratelimit()) {
+ snd_printdd("frame %d active: %d\n", i, urb->iso_frame_desc[i].status);
// continue;
}
bytes = urb->iso_frame_desc[i].actual_length;