patch-2.1.111 linux/drivers/sound/mad16.c

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

diff -u --recursive --new-file v2.1.110/linux/drivers/sound/mad16.c linux/drivers/sound/mad16.c
@@ -249,7 +249,7 @@
 	}
 
 	tmp = mad_read(MC0_PORT+18);
-	if (tmp == 0xff)
+	if (tmp == 0xff || tmp == 0x00)
 		return 1;
 	/* We probably have a C931 */
 	DDB(printk("Detected C931 config=0x%02x\n", tmp));
@@ -840,10 +840,7 @@
 			hw_config->dma,
 			hw_config->dma2, 0);
 	release_region(hw_config->io_base, 4);
-	if(mixer>=0)
-		sound_unload_mixerdev(mixer);
 	sound_unload_audiodev(hw_config->slots[0]);
-
 }
 
 void

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