Commit fc8aa7b1 authored Mar 18, 2010 by Julia Lawall Committed by Takashi Iwai Mar 21, 2010

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>

parent 220bf991

sound/oss/vidc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);