linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / isa / cs423x / cs4236.c

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 07ffd5c..99a4213 100644 (file)
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -133,7 +133,6 @@ static int pnpc_registered;
 static int pnp_registered;
 #endif
 #endif /* CONFIG_PNP */
-static unsigned int snd_cs423x_devices;
 
 struct snd_card_cs4236 {
        struct snd_cs4231 *chip;
@@ -535,7 +534,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
                if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
                                        mpu_port[dev], 0,
                                        mpu_irq[dev],
-                                       mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL) < 0)
+                                       mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0)
                        printk(KERN_WARNING IDENT ": MPU401 not detected\n");
        }
 
@@ -565,7 +564,7 @@ static int __init snd_cs423x_nonpnp_probe(struct platform_device *pdev)
                snd_card_free(card);
                return err;
        }
-
+       
        platform_set_drvdata(pdev, card);
        return 0;
 }
@@ -651,7 +650,6 @@ static int __devinit snd_cs4232_pnpbios_detect(struct pnp_dev *pdev,
        }
        pnp_set_drvdata(pdev, card);
        dev++;
-       snd_cs423x_devices++;
        return 0;
 }
 
@@ -715,7 +713,6 @@ static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
        }
        pnp_set_card_drvdata(pcard, card);
        dev++;
-       snd_cs423x_devices++;
        return 0;
 }
 
@@ -724,7 +721,7 @@ static void __devexit snd_cs423x_pnpc_remove(struct pnp_card_link * pcard)
        snd_card_free(pnp_get_card_drvdata(pcard));
        pnp_set_card_drvdata(pcard, NULL);
 }
-
+                        
 #ifdef CONFIG_PM
 static int snd_cs423x_pnpc_suspend(struct pnp_card_link *pcard, pm_message_t state)
 {
@@ -769,45 +766,51 @@ static void __init_or_module snd_cs423x_unregister_all(void)
 
 static int __init alsa_card_cs423x_init(void)
 {
-       int i, err;
+       int i, err, cards = 0;
 
        if ((err = platform_driver_register(&cs423x_nonpnp_driver)) < 0)
                return err;
 
-       for (i = 0; i < SNDRV_CARDS; i++) {
+       for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
                struct platform_device *device;
-               if (! enable[i] || is_isapnp_selected(i))
+               if (is_isapnp_selected(i))
                        continue;
                device = platform_device_register_simple(CS423X_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device))
-                       continue;
-               if (!platform_get_drvdata(device)) {
-                       platform_device_unregister(device);
-                       continue;
+               if (IS_ERR(device)) {
+                       err = PTR_ERR(device);
+                       goto errout;
                }
                platform_devices[i] = device;
-               snd_cs423x_devices++;
+               cards++;
        }
 #ifdef CONFIG_PNP
 #ifdef CS4232
-       err = pnp_register_driver(&cs4232_pnp_driver);
-       if (!err)
+       i = pnp_register_driver(&cs4232_pnp_driver);
+       if (i >= 0) {
                pnp_registered = 1;
+               cards += i;
+       }
 #endif
-       err = pnp_register_card_driver(&cs423x_pnpc_driver);
-       if (!err)
+       i = pnp_register_card_driver(&cs423x_pnpc_driver);
+       if (i >= 0) {
                pnpc_registered = 1;
+               cards += i;
+       }
 #endif /* CONFIG_PNP */
 
-       if (!snd_cs423x_devices) {
+       if (!cards) {
 #ifdef MODULE
                printk(KERN_ERR IDENT " soundcard not found or device busy\n");
 #endif
-               snd_cs423x_unregister_all();
-               return -ENODEV;
+               err = -ENODEV;
+               goto errout;
        }
        return 0;
+
+ errout:
+       snd_cs423x_unregister_all();
+       return err;
 }
 
 static void __exit alsa_card_cs423x_exit(void)