Skip to content

Commit

Permalink
sound/oss/vidc.c: change the field used with DMA_ACTIVE
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
Julia Lawall authored and tiwai committed Mar 21, 2010
1 parent 220bf99 commit fc8aa7b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/oss/vidc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit fc8aa7b

Please sign in to comment.