[alsa-devel] [PATCH] cs4232: fix crash during chip PNP detection

Takashi Iwai tiwai at suse.de
Mon Jul 28 12:14:41 CEST 2008


At Sun, 27 Jul 2008 11:01:26 +0200,
Rene Herman wrote:
> 
> On 27-07-08 10:49, Takashi Iwai wrote:
> 
> > At 23 Jul 2008 15:03:20 +0200,
> > krzysztof.h1 at poczta.fm wrote:
> >> Rene Herman napisał(a):
> >>> On 23-07-08 07:48, Krzysztof Helt wrote:
> >>>
> >>>
> >>> Looking back, it seems this was broken at least as far back as 2.6.20 
> >>> which would nicely show how much testing that code path gets. Do I 
> >>> understand correctly from the backtrace that you have the PNPBIOS 
> >>> hardware? If so, good...
> >>>
> >> Yes, I borrowed old laptop with PNP bios but no ISA PnP devices.
> >> I will test my wss_lib on it.
> >>
> >>>> --- linux-2.6.26/sound/isa/cs423x/cs4236.c~	2008-07-23
> >>> 07:40:16.129637645 +0200
> >>>> +++ linux-2.6.26/sound/isa/cs423x/cs4236.c	2008-07-23 07:40:32.905641806
> >>> +0200
> >>>> @@ -325,6 +325,7 @@ static int __devinit snd_cs423x_pnp_init
> >>>>  static int __devinit snd_card_cs4232_pnp(int dev, struct
> >>> snd_card_cs4236 *acard,
> >>>>  					 struct pnp_dev *pdev)
> >>>>  {
> >>>> +	acard->wss = pdev;
> >>>>  	if (snd_cs423x_pnp_init_wss(dev, acard->wss) > 0)
> >>>>  		return -EBUSY;
> >>>>  	cport[dev] = -1;
> >>>>
> >>> Acked-by: Rene Herman >rene.herman at gmail.com>
> >>>
> >>> (I believe I noticed earlier that struct snd_cs4236->wss, ctrl and mpu 
> >>> really needn't/shouldn't be kept around in the first place and you could 
> >>> just pass pdev directly as well but that's for another cleanup; this has 
> >>> it look most similar to the card variant)
> >>>
> >> Feel free to changed it but I prefer to have the wss_lib patches merged first to avoid
> >> conflicts and redoing the patches.
> > 
> > Sorry, but this has to be pushed as soon as possible while wss_lib
> > patches are for 2.6.28.
> 
> Yes, Krysztof's patch does -- he's just commenting on my comment between 
> () there. I acked his minimal patch and added you and Jaroslav to the CC 
> and commented that it was for .27...

Thanks.  The patch was already merged to the upstream.


Takashi


More information about the Alsa-devel mailing list