patch-2.2.0-pre5 linux/drivers/sound/ad1848.c

Next file: linux/drivers/sound/dev_table.c
Previous file: linux/drivers/sound/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre4/linux/drivers/sound/ad1848.c linux/drivers/sound/ad1848.c
@@ -1944,10 +1944,11 @@
 			if (devc->irq > 0) /* There is no point in freeing irq, if it wasn't allocated */
 				free_irq(devc->irq, (void *)devc->dev_no);
 
-			sound_free_dma(audio_devs[dev]->dmap_out->dma);
+			sound_free_dma(dma_playback);
+
+			if (dma_playback != dma_capture)
+				sound_free_dma(dma_capture);
 
-			if (audio_devs[dev]->dmap_in->dma != audio_devs[dev]->dmap_out->dma)
-				sound_free_dma(audio_devs[dev]->dmap_in->dma);
 		}
 		mixer = audio_devs[devc->dev_no]->mixer_dev;
 		if(mixer>=0)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov