summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2014-04-09 11:30:44 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-09 11:14:02 -0700
commit24ec54eece1d7c71dbbb5e7c6831566d98135348 (patch)
tree653b37d26c78d738087595cd295d10a895015afa /sound
parentd791a3e3ebce3b1f91381bbe2eee5224612b7d51 (diff)
ALSA: usb-audio: Suppress repetitive debug messages from retire_playback_urb()
commit a5065eb6da55b226661456e6a7435f605df98111 upstream. BugLink: http://bugs.launchpad.net/bugs/1305133 Malfunctioning or slow devices can cause a flood of dmesg SPAM. I've ignored checkpatch.pl complaints about the use of printk_ratelimit() in favour of prior art in sound/usb/pcm.c. WARNING: Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit + if (printk_ratelimit() && Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: Eldad Zack <eldad@fogrefinery.com> Cc: Daniel Mack <zonque@gmail.com> Cc: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/pcm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 93b6e32cfead..be6dfd4bbdbb 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -1419,7 +1419,8 @@ static void retire_playback_urb(struct snd_usb_substream *subs,
* The error should be lower than 2ms since the estimate relies
* on two reads of a counter updated every ms.
*/
- if (abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
+ if (printk_ratelimit() &&
+ abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
snd_printk(KERN_DEBUG "delay: estimated %d, actual %d\n",
est_delay, subs->last_delay);