diff options
| author | Julia Lawall <julia@diku.dk> | 2010-03-18 07:53:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-21 09:32:09 +0100 |
| commit | fc8aa7b16a5fcfe9c6d0be9bb587f1fcedd9145f (patch) | |
| tree | 79fb77b27719cf51dcc7b2f11f60ba7d3e805657 /sound/oss/vidc.c | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
| download | linux-stable-fc8aa7b16a5fcfe9c6d0be9bb587f1fcedd9145f.tar.gz linux-stable-fc8aa7b16a5fcfe9c6d0be9bb587f1fcedd9145f.tar.bz2 linux-stable-fc8aa7b16a5fcfe9c6d0be9bb587f1fcedd9145f.zip | |
sound/oss/vidc.c: change the field used with DMA_ACTIVE
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/vidc.c')
| -rw-r--r-- | 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 725fef0f59a3..a4127bab9231 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); |