From: Takashi Iwai <tiwai@suse•de>
To: Ben Gardiner <bengardiner@nanometrics•ca>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
alsa-devel@alsa-project•org
Subject: Re: [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log
Date: Thu, 19 May 2011 07:28:40 +0200 [thread overview]
Message-ID: <s5hk4dn1con.wl%tiwai@suse.de> (raw)
In-Reply-To: <1305777158-21361-1-git-send-email-bengardiner@nanometrics.ca>
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
>
prev parent reply other threads:[~2011-05-19 5:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 1:15 linux-next: build failure after merge of the sound tree Stephen Rothwell
2011-05-19 3:52 ` [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log Ben Gardiner
2011-05-19 5:28 ` Takashi Iwai [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5hk4dn1con.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=alsa-devel@alsa-project$(echo .)org \
--cc=bengardiner@nanometrics$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox