From: Takashi Iwai <tiwai@suse.de>
To: Julia Lawall <julia@diku.dk>
Cc: rmk@arm.linux.org.uk, perex@perex.cz,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] sound/oss/vidc.c: change the field used with DMA_ACTIVE
Date: Sun, 21 Mar 2010 09:38:16 +0100 [thread overview]
Message-ID: <s5haau2dq87.wl%tiwai@suse.de> (raw)
In-Reply-To: <Pine.LNX.4.64.1003180752400.23843@ask.diku.dk>
At Thu, 18 Mar 2010 07:53:11 +0100 (CET),
Julia Lawall wrote:
>
> From: Julia Lawall <julia@diku.dk>
>
> The constant DMA_ACTIVE is defined with the dma_buffparams structure rather
> than with the audio_operations structure. Takashi Iwai suggested that the
> dmap_out field of the audio_operations structure should be used instead.
>
> This is not tested.
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
Applied now. Thanks.
Takashi
>
> ---
> sound/oss/vidc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
> index 725fef0..a4127ba 100644
> --- a/sound/oss/vidc.c
> +++ b/sound/oss/vidc.c
> @@ -363,13 +363,13 @@ static void vidc_audio_trigger(int dev, int enable_bits)
> struct audio_operations *adev = audio_devs[dev];
>
> if (enable_bits & PCM_ENABLE_OUTPUT) {
> - if (!(adev->flags & DMA_ACTIVE)) {
> + if (!(adev->dmap_out->flags & DMA_ACTIVE)) {
> unsigned long flags;
>
> local_irq_save(flags);
>
> /* prevent recusion */
> - adev->flags |= DMA_ACTIVE;
> + adev->dmap_out->flags |= DMA_ACTIVE;
>
> dma_interrupt = vidc_audio_dma_interrupt;
> vidc_sound_dma_irq(0, NULL);
>
prev parent reply other threads:[~2010-03-21 8:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-18 6:53 Julia Lawall
2010-03-21 8:38 ` 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=s5haau2dq87.wl%tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=julia@diku.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=rmk@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®