patch-1.3.59 linux/drivers/sound/sb16_dsp.c

Next file: linux/drivers/sound/sb_dsp.c
Previous file: linux/drivers/scsi/hosts.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.58/linux/drivers/sound/sb16_dsp.c linux/drivers/sound/sb16_dsp.c
@@ -410,8 +410,8 @@
   audio_devs[my_dev]->dmachan1 = dsp_16bit ? dma16 : dma8;
   dsp_count = 0;
   dsp_cleanup ();
-  sb_dsp_command (0xd0);	/* Halt DMA until trigger() is called */
   trigger_bits = 0;
+  sb_dsp_command (0xd4);
   return 0;
 }
 
@@ -421,20 +421,14 @@
   audio_devs[my_dev]->dmachan1 = dsp_16bit ? dma16 : dma8;
   dsp_count = 0;
   dsp_cleanup ();
-  sb_dsp_command (0xd0);	/* Halt DMA until trigger() is called */
   trigger_bits = 0;
+  sb_dsp_command (0xd4);
   return 0;
 }
 
 static void
 sb16_dsp_trigger (int dev, int bits)
 {
-  if (bits != 0)
-    bits = 1;
-
-  if (bits == trigger_bits)	/* No change */
-    return;
-
   trigger_bits = bits;
 
   if (!bits)

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