summaryrefslogtreecommitdiffstats
path: root/sound/isa/cs423x
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-07-23 07:48:49 +0200
committerTakashi Iwai <tiwai@suse.de>2008-07-27 10:22:27 +0200
commitb15ebe2616289da258f85b3ff142fca237ef9f59 (patch)
treed404eca0cbee1545215c94271cb775bef6925f1b /sound/isa/cs423x
parentALSA: hda - Add automatic model setting for the Acer Aspire 5920G laptop (diff)
downloadlinux-b15ebe2616289da258f85b3ff142fca237ef9f59.tar.xz
linux-b15ebe2616289da258f85b3ff142fca237ef9f59.zip
ALSA: cs4232: fix crash during chip PNP detection
The acard->wss pointer is uninitialized in this function which leads to crash during chip PNP detection. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Acked-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/cs423x')
-rw-r--r--sound/isa/cs423x/cs4236.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index dbe63db4bfd6..4d4b8ddc26ba 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -325,6 +325,7 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
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;