summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorBen Gardiner <bengardiner@nanometrics.ca>2011-05-18 23:52:38 -0400
committerTakashi Iwai <tiwai@suse.de>2011-05-19 07:18:56 +0200
commit217658f46c2dbfe260f8f5976f2a201911a2f4c6 (patch)
treea7b8c9ed6940152c9ff0a8f9d266cda43752370a /sound
parentec08b14483de0702ca43e3a8506e149486975f9b (diff)
downloadlinux-3.10-217658f46c2dbfe260f8f5976f2a201911a2f4c6.tar.gz
linux-3.10-217658f46c2dbfe260f8f5976f2a201911a2f4c6.tar.bz2
linux-3.10-217658f46c2dbfe260f8f5976f2a201911a2f4c6.zip
ALSA: sound, core, pcm_lib: fix xrun_log
The xrun_log function was augmented with the in_interrupt parameter whereas the empty macro definition used when xrun logging is disabled was not. Add a third parameter to the empty macro definition so as to not cause compiler errors when xrun logging (CONFIG_SND_PCM_XRUN_DEBUG) is disabled. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/pcm_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index c8c8091f9a7..abfeff1611c 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -266,7 +266,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
#else /* ! CONFIG_SND_PCM_XRUN_DEBUG */
#define hw_ptr_error(substream, fmt, args...) do { } while (0)
-#define xrun_log(substream, pos) do { } while (0)
+#define xrun_log(substream, pos, in_interrupt) do { } while (0)
#define xrun_log_show(substream) do { } while (0)
#endif