* [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log
[not found] <20110519111557.f147fc1e.sfr@canb.auug.org.au>
@ 2011-05-19 3:52 ` Ben Gardiner
2011-05-19 5:28 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Ben Gardiner @ 2011-05-19 3:52 UTC (permalink / raw)
To: Stephen Rothwell, Takashi Iwai; +Cc: linux-next, linux-kernel, alsa-devel
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.
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log
2011-05-19 3:52 ` [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log Ben Gardiner
@ 2011-05-19 5:28 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2011-05-19 5:28 UTC (permalink / raw)
To: Ben Gardiner; +Cc: Stephen Rothwell, linux-next, linux-kernel, alsa-devel
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-19 5:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20110519111557.f147fc1e.sfr@canb.auug.org.au>
2011-05-19 3:52 ` [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log Ben Gardiner
2011-05-19 5:28 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).