Missing patch in sound driver (2.0.31-pre7)

SL Baur (steve@xemacs.org)
17 Aug 1997 21:26:33 -0700


(Perfect patch up and build).

There appears to be a missing patch in the sound driver (it was the
only change 2.0.30 -> 2.0.31pre6), was this intentional?

diff --unified linux-2.0.31-pre6/drivers/sound/sb_common.c linux-2.0.31-pre7/drivers/sound/sb_common.c
--- linux-2.0.31-pre6/drivers/sound/sb_common.c Thu Aug 14 17:35:40 1997
+++ linux-2.0.31-pre7/drivers/sound/sb_common.c Wed Sep 11 07:57:14 1996
@@ -583,20 +583,6 @@
* Detect the device
*/

- cli(); /* Some ESS1688 cards need this */
- inb (devc->base + 0x9);
- inb (devc->base + 0x9);
- inb (devc->base + 0x9);
- inb (devc->base + 0xb);
- inb (devc->base + 0x9);
- inb (devc->base + 0xb);
- inb (devc->base + 0x9);
- inb (devc->base + 0x9);
- inb (devc->base + 0xb);
- inb (devc->base + 0x9);
- inb (devc->base);
- sti();
-
if (sb_dsp_reset (devc))
dsp_get_vers (devc);
else
diff --unified linux-2.0.31-pre6/drivers/sound/sequencer.c linux-2.0.31-pre7/drivers/sound/sequencer.c
--- linux-2.0.31-pre6/drivers/sound/sequencer.c Thu Aug 14 17:35:40 1997
+++ linux-2.0.31-pre7/drivers/sound/sequencer.c Tue Aug 20 23:18:09 1996
@@ -2038,7 +2038,7 @@
iqueue = (unsigned char *) (sound_mem_blocks[sound_nblocks] = vmalloc (SEQ_MAX_QUEUE * IEV_SZ));
if (sound_nblocks < 1024)
sound_nblocks++;;
- if (iqueue == NULL)
+ if (queue == NULL)
{
printk ("Sound: Can't allocate memory for sequencer input queue\n");
return;