summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorSander Eikelenboom <linux@eikelenboom.it>2014-05-02 15:09:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-09 11:14:02 -0700
commit7b938dbb38a6c70cbcae07720012a937ed989b48 (patch)
treeea0fa8e78eb554fdfe82f2fa4db957efa4c58690 /sound
parent24ec54eece1d7c71dbbb5e7c6831566d98135348 (diff)
downloadlinux-3.10-7b938dbb38a6c70cbcae07720012a937ed989b48.tar.gz
linux-3.10-7b938dbb38a6c70cbcae07720012a937ed989b48.tar.bz2
linux-3.10-7b938dbb38a6c70cbcae07720012a937ed989b48.zip
ALSA: usb-audio: Prevent printk ratelimiting from spamming kernel log while DEBUG not defined
commit b7a7723513dc89f83d6df13206df55d4dc26e825 upstream. This (widely used) construction: if(printk_ratelimit()) dev_dbg() Causes the ratelimiting to spam the kernel log with the "callbacks suppressed" message below, even while the dev_dbg it is supposed to rate limit wouldn't print anything because DEBUG is not defined for this device. [ 533.803964] retire_playback_urb: 852 callbacks suppressed [ 538.807930] retire_playback_urb: 852 callbacks suppressed [ 543.811897] retire_playback_urb: 852 callbacks suppressed [ 548.815745] retire_playback_urb: 852 callbacks suppressed [ 553.819826] retire_playback_urb: 852 callbacks suppressed So use dev_dbg_ratelimited() instead of this construction. Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it> 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index be6dfd4bbdb..0d7a872dab3 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -1419,9 +1419,9 @@ 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 (printk_ratelimit() &&
- abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
- snd_printk(KERN_DEBUG "delay: estimated %d, actual %d\n",
+ if (abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
+ dev_dbg_ratelimited(&subs->dev->dev,
+ "delay: estimated %d, actual %d\n",
est_delay, subs->last_delay);
if (!subs->running) {