patch-1.3.75 linux/drivers/sound/sb_dsp.c

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

diff -u --recursive --new-file v1.3.74/linux/drivers/sound/sb_dsp.c linux/drivers/sound/sb_dsp.c
@@ -827,9 +827,6 @@
       return -ENXIO;
     }
 
-  if (!sb_midi_busy)
-    sb_reset_dsp ();
-
   if (sb_no_recording && mode & OPEN_READ)
     {
       printk ("SB Warning: Recording not supported by this device\n");
@@ -837,9 +834,12 @@
 
   if (sb_intr_active || (sb_midi_busy && sb_midi_mode == UART_MIDI))
     {
-      printk ("SB: PCM not possible during MIDI input\n");
+      printk ("SB: Audio device or MIDI already in use\n");
       return -EBUSY;
     }
+
+  if (!sb_midi_busy)
+    sb_reset_dsp ();
 
   if (!irq_verified)
     {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this