patch-2.3.99-pre3 linux/drivers/sound/sb_common.c

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

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/sound/sb_common.c linux/drivers/sound/sb_common.c
@@ -908,13 +908,10 @@
 		}
 		if (!(devc->caps & SB_NO_AUDIO && devc->caps & SB_NO_MIDI))
 		{
-			extern int sbmixnum;
-			
 			if (devc->irq > 0)
 				free_irq(devc->irq, devc);
 
-			sound_unload_mixerdev(devc->my_mixerdev);
-			sbmixnum--;
+			sb_mixer_unload(devc);
 			/* We don't have to do this bit any more the UART401 is its own
 				master  -- Krzysztof Halasa */
 			/* But we have to do it, if UART401 is not detected */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)