diff options
Diffstat (limited to 'sound/oss/vidc.c')
| -rw-r--r-- | sound/oss/vidc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 725fef0f59a3..ac39a531df19 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | * We currently support a mixer device, but it is currently non-functional. | 17 | * We currently support a mixer device, but it is currently non-functional. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/gfp.h> | ||
| 20 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 21 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| @@ -363,13 +364,13 @@ static void vidc_audio_trigger(int dev, int enable_bits) | |||
| 363 | struct audio_operations *adev = audio_devs[dev]; | 364 | struct audio_operations *adev = audio_devs[dev]; |
| 364 | 365 | ||
| 365 | if (enable_bits & PCM_ENABLE_OUTPUT) { | 366 | if (enable_bits & PCM_ENABLE_OUTPUT) { |
| 366 | if (!(adev->flags & DMA_ACTIVE)) { | 367 | if (!(adev->dmap_out->flags & DMA_ACTIVE)) { |
| 367 | unsigned long flags; | 368 | unsigned long flags; |
| 368 | 369 | ||
| 369 | local_irq_save(flags); | 370 | local_irq_save(flags); |
| 370 | 371 | ||
| 371 | /* prevent recusion */ | 372 | /* prevent recusion */ |
| 372 | adev->flags |= DMA_ACTIVE; | 373 | adev->dmap_out->flags |= DMA_ACTIVE; |
| 373 | 374 | ||
| 374 | dma_interrupt = vidc_audio_dma_interrupt; | 375 | dma_interrupt = vidc_audio_dma_interrupt; |
| 375 | vidc_sound_dma_irq(0, NULL); | 376 | vidc_sound_dma_irq(0, NULL); |
