ALSA: cs4236: detect chip in one pass

The cs4236 was two step detection with call to the snd_wss_free()
between two steps. The snd_wss_free() did not free a sound device
created in the snd_wss_create(). This caused an OOPS during module
removal as the same sound device was released twice. The same OOPS
happened if the cs4236 module loading failed.

Fix this by adapting the snd_cs4236_create() to correctly work with
chips less capable then cs4236. The snd_cs4236_create() behaves the
same as the snd_wss_create() if the chip is less capable than the cs4236.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 3 insertions, 10 deletions

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index a076a6ce8071..93fa6720d197 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -394,21 +394,15 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
                         return -EBUSY;
                 }
 
-        err = snd_wss_create(card, port[dev], cport[dev],
+        err = snd_cs4236_create(card, port[dev], cport[dev],
                              irq[dev],
                              dma1[dev], dma2[dev],
                              WSS_HW_DETECT3, 0, &chip);
         if (err < 0)
                 return err;
+
+        acard->chip = chip;
         if (chip->hardware & WSS_HW_CS4236B_MASK) {
-                snd_wss_free(chip);
-                err = snd_cs4236_create(card,
-                                        port[dev], cport[dev],
-                                        irq[dev], dma1[dev], dma2[dev],
-                                        WSS_HW_DETECT, 0, &chip);
-                if (err < 0)
-                        return err;
-                acard->chip = chip;
 
                 err = snd_cs4236_pcm(chip, 0, &pcm);
                 if (err < 0)
@@ -418,7 +412,6 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
                 if (err < 0)
                         return err;
         } else {
-                acard->chip = chip;
                 err = snd_wss_pcm(chip, 0, &pcm);
                 if (err < 0)
                         return err;