Re: [Alsa-devel] Slab corruptions & Re: 2.6.17-rc1: Oops in sound applications

[Takashi Iwai <tiwai@suse.de>]

At Wed, 05 Apr 2006 14:39:29 +0200,
I wrote:
> 
> At Wed, 5 Apr 2006 14:15:38 +0200,
> Jan Niehusmann wrote:
> > 
> > On Wed, Apr 05, 2006 at 01:14:54PM +0200, Takashi Iwai wrote:
> > > Try the patch below.  The change in pcm_native.c may be unnecessary,
> > > but it's better so.
> > > If it works, I'll submit the patches with a proper log.
> > 
> > The patch (applied to 2.6.17-rc1) does fix the oops, but sound is still
> > garbled with twinkle using /dev/dsp. 
> > 
> > About this garbled sound: I call an echo service on my asterisk server,
> > which just echoes back everything I say. Works well using /dev/dsp with
> > 2.6.16, but with 2.6.17-rc1, even with the patch applied, I hear no echo
> > at all for ~1s. After that, I hear a strongly distorted echo.
> 
> Did you have any special setting (e.g. oss proc file)?

How about the patch below?


Takashi


diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 91114c7..c951cf8 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1682,7 +1682,7 @@ static void snd_pcm_oss_init_substream(s
 	substream->oss.setup = *setup;
 	if (setup->nonblock)
 		substream->ffile->f_flags |= O_NONBLOCK;
-	else
+	else if (setup->block)
 		substream->ffile->f_flags &= ~O_NONBLOCK;
 	runtime = substream->runtime;
 	runtime->oss.params = 1;