At Wed, 18 May 2011 23:52:38 -0400, Ben Gardiner wrote:

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

---

This fixes the build error caused by ec08b14483de ("ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt") -- which was my patch. Sorry for the breakage.

Applied now. Thanks.

Takashi

---

sound/core/pcm_lib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

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

1.7.4.1