From: Ben Gardiner Date: Thu, 19 May 2011 03:52:38 +0000 (-0400) Subject: ALSA: sound, core, pcm_lib: fix xrun_log X-Git-Tag: v3.0-rc1~51^2~14^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=217658f46c2dbfe260f8f5976f2a201911a2f4c6;p=platform%2Fupstream%2Fkernel-adaptation-pc.git 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 Signed-off-by: Takashi Iwai --- diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index c8c8091..abfeff16 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