* [PATCH] sound/oss/vidc.c: change the field used with DMA_ACTIVE
@ 2010-03-18 6:53 Julia Lawall
2010-03-21 8:38 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Julia Lawall @ 2010-03-18 6:53 UTC (permalink / raw
To: tiwai, rmk, perex, alsa-devel, linux-kernel, kernel-janitors
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>
---
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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sound/oss/vidc.c: change the field used with DMA_ACTIVE
2010-03-18 6:53 [PATCH] sound/oss/vidc.c: change the field used with DMA_ACTIVE Julia Lawall
@ 2010-03-21 8:38 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-03-21 8:38 UTC (permalink / raw
To: Julia Lawall; +Cc: rmk, perex, alsa-devel, linux-kernel, kernel-janitors
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);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-21 8:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-18 6:53 [PATCH] sound/oss/vidc.c: change the field used with DMA_ACTIVE Julia Lawall
2010-03-21 8:38 ` 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 read-only IMAP folder(s) and NNTP newsgroup(s).