[PATCH] prepatch-2.1.90-1 sound

Itai Nahshon (nahshon@actcom.co.il)
Wed, 11 Mar 1998 16:03:57 +0200


This is a multi-part message in MIME format.
--------------697D14BAEAE1FE834EB82FCB
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

1. Removed all includes of <kerneld.h>.
2. I just tried to set my card (82C931) full-duplex and got an Oops.
The oops is in where dmap->raw_buf is NULL.
To fix, I chose to set fragment_size to 0 when releasing the
dma buffer.

To repeat the Oops: you must have a duplex capable card.
echo x > /dev/dsp ; echo < /dev/dsp

An alternate fix (not tested) would be to check for
dmap->raw_buf == NULL in sync_output().

Itai

-- 
Itai Nahshon   nahshon@actcom.co.il
        Also   nahshon@vnet.ibm.com
--------------697D14BAEAE1FE834EB82FCB
Content-Type: text/plain; charset=us-ascii; name="diff-2.1.90-pre1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="diff-2.1.90-pre1"

diff -r -u linux-2.1.90-pre1/drivers/sound/audio.c linux/drivers//sound/audio.c --- linux-2.1.90-pre1/drivers/sound/audio.c Wed Mar 11 15:18:01 1998 +++ linux/drivers//sound/audio.c Wed Mar 11 15:34:41 1998 @@ -21,7 +21,6 @@ #include <linux/config.h> #include <linux/stddef.h> -#include <linux/kerneld.h> #include "sound_config.h" diff -r -u linux-2.1.90-pre1/drivers/sound/dmabuf.c linux/drivers//sound/dmabuf.c --- linux-2.1.90-pre1/drivers/sound/dmabuf.c Wed Mar 11 15:18:36 1998 +++ linux/drivers//sound/dmabuf.c Wed Mar 11 15:38:10 1998 @@ -125,6 +125,7 @@ free_pages((unsigned long) dmap->raw_buf, sz); dmap->raw_buf = NULL; + dmap->fragment_size = 0; } diff -r -u linux-2.1.90-pre1/drivers/sound/midibuf.c linux/drivers//sound/midibuf.c --- linux-2.1.90-pre1/drivers/sound/midibuf.c Wed Mar 11 15:18:16 1998 +++ linux/drivers//sound/midibuf.c Wed Mar 11 12:44:14 1998 @@ -15,7 +15,6 @@ */ #include <linux/config.h> #include <linux/stddef.h> -#include <linux/kerneld.h> #define MIDIBUF_C diff -r -u linux-2.1.90-pre1/drivers/sound/soundcard.c linux/drivers//sound/soundcard.c --- linux-2.1.90-pre1/drivers/sound/soundcard.c Wed Mar 11 15:18:16 1998 +++ linux/drivers//sound/soundcard.c Wed Mar 11 12:42:30 1998 @@ -26,7 +26,6 @@ #include <linux/fcntl.h> #include <linux/ctype.h> #include <linux/stddef.h> -#include <linux/kerneld.h> #ifdef __KERNEL__ #include <asm/io.h> #include <asm/segment.h>

--------------697D14BAEAE1FE834EB82FCB--

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu