2008-08-02 13:15:44

by Oliver Pinter

[permalink] [raw]
Subject: [RFC, 2.6.26.2-rc1] ALSA: cs4232: fix crash during chip PNP detection

>From b15ebe2616289da258f85b3ff142fca237ef9f59 Mon Sep 17 00:00:00 2001
From: Krzysztof Helt <[email protected]>
Date: Wed, 23 Jul 2008 07:48:49 +0200
Subject: [PATCH] ALSA: cs4232: fix crash during chip PNP detection

[ Upstream commit b15ebe2616289da258f85b3ff142fca237ef9f59 ]

The acard->wss pointer is uninitialized in this function
which leads to crash during chip PNP detection.

Signed-off-by: Krzysztof Helt <[email protected]>
Acked-by: Rene Herman <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
CC: Oliver Pinter <[email protected]>

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index dbe63db..4d4b8dd 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;