Merge branch 'master'

6 files changed, 101 insertions, 113 deletions

diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index 028af4066595..5375705c054b 100644
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -1097,7 +1097,7 @@ snd_emu8000_new(snd_card_t *card, int index, long port, int seq_ports, snd_seq_d
         if (seq_ports <= 0)
                 return 0;
 
-        hw = kcalloc(1, sizeof(*hw), GFP_KERNEL);
+        hw = kzalloc(sizeof(*hw), GFP_KERNEL);
         if (hw == NULL)
                 return -ENOMEM;
         spin_lock_init(&hw->reg_lock);
diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c
index db5eb8b55058..0209790dc4b5 100644
--- a/sound/isa/sb/emu8000_pcm.c
+++ b/sound/isa/sb/emu8000_pcm.c
@@ -233,7 +233,7 @@ static int emu8k_pcm_open(snd_pcm_substream_t *subs)
         emu8k_pcm_t *rec;
         snd_pcm_runtime_t *runtime = subs->runtime;
 
-        rec = kcalloc(1, sizeof(*rec), GFP_KERNEL);
+        rec = kzalloc(sizeof(*rec), GFP_KERNEL);
         if (! rec)
                 return -ENOMEM;
 
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 60e2c53c49fc..7888783d68f5 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -351,6 +351,12 @@ static void snd_sb16_free(snd_card_t *card)
         }
 }
 
+#ifdef CONFIG_PNP
+#define is_isapnp_selected(dev)         isapnp[dev]
+#else
+#define is_isapnp_selected(dev)         0
+#endif
+
 static int __init snd_sb16_probe(int dev,
                                  struct pnp_card_link *pcard,
                                  const struct pnp_card_device_id *pid)
@@ -378,10 +384,8 @@ static int __init snd_sb16_probe(int dev,
         card->private_free = snd_sb16_free;
 #ifdef CONFIG_PNP
         if (isapnp[dev]) {
-                if ((err = snd_card_sb16_pnp(dev, acard, pcard, pid))) {
-                        snd_card_free(card);
-                        return err;
-                }
+                if ((err = snd_card_sb16_pnp(dev, acard, pcard, pid)))
+                        goto _err;
                 snd_card_set_dev(card, &pcard->card->dev);
         }
 #endif
@@ -389,41 +393,37 @@ static int __init snd_sb16_probe(int dev,
         xirq = irq[dev];
         xdma8 = dma8[dev];
         xdma16 = dma16[dev];
-#ifdef CONFIG_PNP
-        if (!isapnp[dev]) {
-#endif
-        if (xirq == SNDRV_AUTO_IRQ) {
-                if ((xirq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
-                        snd_card_free(card);
-                        snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");
-                        return -EBUSY;
+        if (! is_isapnp_selected(dev)) {
+                if (xirq == SNDRV_AUTO_IRQ) {
+                        if ((xirq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
+                                snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");
+                                err = -EBUSY;
+                                goto _err;
+                        }
                 }
-        }
-        if (xdma8 == SNDRV_AUTO_DMA) {
-                if ((xdma8 = snd_legacy_find_free_dma(possible_dmas8)) < 0) {
-                        snd_card_free(card);
-                        snd_printk(KERN_ERR PFX "unable to find a free 8-bit DMA\n");
-                        return -EBUSY;
+                if (xdma8 == SNDRV_AUTO_DMA) {
+                        if ((xdma8 = snd_legacy_find_free_dma(possible_dmas8)) < 0) {
+                                snd_printk(KERN_ERR PFX "unable to find a free 8-bit DMA\n");
+                                err = -EBUSY;
+                                goto _err;
+                        }
                 }
-        }
-        if (xdma16 == SNDRV_AUTO_DMA) {
-                if ((xdma16 = snd_legacy_find_free_dma(possible_dmas16)) < 0) {
-                        snd_card_free(card);
-                        snd_printk(KERN_ERR PFX "unable to find a free 16-bit DMA\n");
-                        return -EBUSY;
+                if (xdma16 == SNDRV_AUTO_DMA) {
+                        if ((xdma16 = snd_legacy_find_free_dma(possible_dmas16)) < 0) {
+                                snd_printk(KERN_ERR PFX "unable to find a free 16-bit DMA\n");
+                                err = -EBUSY;
+                                goto _err;
+                        }
                 }
-        }
-        /* non-PnP FM port address is hardwired with base port address */
-        fm_port[dev] = port[dev];
-        /* block the 0x388 port to avoid PnP conflicts */
-        acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
+                /* non-PnP FM port address is hardwired with base port address */
+                fm_port[dev] = port[dev];
+                /* block the 0x388 port to avoid PnP conflicts */
+                acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
 #ifdef SNDRV_SBAWE_EMU8000
-        /* non-PnP AWE port address is hardwired with base port address */
-        awe_port[dev] = port[dev] + 0x400;
+                /* non-PnP AWE port address is hardwired with base port address */
+                awe_port[dev] = port[dev] + 0x400;
 #endif
-#ifdef CONFIG_PNP
         }
-#endif
 
         if ((err = snd_sbdsp_create(card,
                                     port[dev],
@@ -432,28 +432,20 @@ static int __init snd_sb16_probe(int dev,
                                     xdma8,
                                     xdma16,
                                     SB_HW_AUTO,
-                                    &chip)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+                                    &chip)) < 0)
+                goto _err;
+
         if (chip->hardware != SB_HW_16) {
-                snd_card_free(card);
-                snd_printdd("SB 16 chip was not detected at 0x%lx\n", port[dev]);
-                return -ENODEV;
+                snd_printk(KERN_ERR PFX "SB 16 chip was not detected at 0x%lx\n", port[dev]);
+                err = -ENODEV;
+                goto _err;
         }
         chip->mpu_port = mpu_port[dev];
-#ifdef CONFIG_PNP
-        if (!isapnp[dev] && (err = snd_sb16dsp_configure(chip)) < 0) {
-#else
-        if ((err = snd_sb16dsp_configure(chip)) < 0) {
-#endif
-                snd_card_free(card);
-                return -ENXIO;
-        }
-        if ((err = snd_sb16dsp_pcm(chip, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return -ENXIO;
-        }
+        if (! is_isapnp_selected(dev) && (err = snd_sb16dsp_configure(chip)) < 0)
+                goto _err;
+
+        if ((err = snd_sb16dsp_pcm(chip, 0, NULL)) < 0)
+                goto _err;
 
         strcpy(card->driver,
 #ifdef SNDRV_SBAWE_EMU8000
@@ -474,10 +466,8 @@ static int __init snd_sb16_probe(int dev,
         if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,
                                                chip->mpu_port, 0,
-                                               xirq, 0, &chip->rmidi)) < 0) {
-                        snd_card_free(card);
-                        return -ENXIO;
-                }
+                                               xirq, 0, &chip->rmidi)) < 0)
+                        goto _err;
                 chip->rmidi_callback = snd_mpu401_uart_interrupt;
         }
 
@@ -499,17 +489,13 @@ static int __init snd_sb16_probe(int dev,
 #else
                         int seqdev = 1;
 #endif
-                        if ((err = snd_opl3_hwdep_new(opl3, 0, seqdev, &synth)) < 0) {
-                                snd_card_free(card);
-                                return -ENXIO;
-                        }
+                        if ((err = snd_opl3_hwdep_new(opl3, 0, seqdev, &synth)) < 0)
+                                goto _err;
                 }
         }
 
-        if ((err = snd_sbmixer_new(chip)) < 0) {
-                snd_card_free(card);
-                return -ENXIO;
-        }
+        if ((err = snd_sbmixer_new(chip)) < 0)
+                goto _err;
 
 #ifdef CONFIG_SND_SB16_CSP
         /* CSP chip on SB16ASP/AWE32 */
@@ -525,11 +511,11 @@ static int __init snd_sb16_probe(int dev,
 #endif
 #ifdef SNDRV_SBAWE_EMU8000
         if (awe_port[dev] > 0) {
-                if (snd_emu8000_new(card, 1, awe_port[dev],
-                                    seq_ports[dev], NULL) < 0) {
+                if ((err = snd_emu8000_new(card, 1, awe_port[dev],
+                                           seq_ports[dev], NULL)) < 0) {
                         snd_printk(KERN_ERR PFX "fatal error - EMU-8000 synthesizer not detected at 0x%lx\n", awe_port[dev]);
-                        snd_card_free(card);
-                        return -ENXIO;
+
+                        goto _err;
                 }
         }
 #endif
@@ -541,15 +527,21 @@ static int __init snd_sb16_probe(int dev,
                 (mic_agc[dev] ? 0x00 : 0x01));
         spin_unlock_irqrestore(&chip->mixer_lock, flags);
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto _err;
+
+        if ((err = snd_card_register(card)) < 0)
+                goto _err;
+
         if (pcard)
                 pnp_set_card_drvdata(pcard, card);
         else
                 snd_sb16_legacy[dev] = card;
         return 0;
+
+ _err:
+        snd_card_free(card);
+        return err;
 }
 
 static int __init snd_sb16_probe_legacy_port(unsigned long xport)
@@ -560,10 +552,8 @@ static int __init snd_sb16_probe_legacy_port(unsigned long xport)
         for ( ; dev < SNDRV_CARDS; dev++) {
                 if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
                         continue;
-#ifdef CONFIG_PNP
-                if (isapnp[dev])
+                if (is_isapnp_selected(dev))
                         continue;
-#endif
                 port[dev] = xport;
                 res = snd_sb16_probe(dev, NULL, NULL);
                 if (res < 0)
@@ -621,10 +611,8 @@ static int __init alsa_card_sb16_init(void)
         for (dev = 0; dev < SNDRV_CARDS; dev++) {
                 if (!enable[dev] || port[dev] == SNDRV_AUTO_PORT)
                         continue;
-#ifdef CONFIG_PNP
-                if (isapnp[dev])
+                if (is_isapnp_selected(dev))
                         continue;
-#endif
                 if (!snd_sb16_probe(dev, NULL, NULL)) {
                         cards++;
                         continue;
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index d64790bcd831..7192d4c758e6 100644
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -122,7 +122,7 @@ int snd_sb_csp_new(sb_t *chip, int device, snd_hwdep_t ** rhwdep)
         if ((err = snd_hwdep_new(chip->card, "SB16-CSP", device, &hw)) < 0)
                 return err;
 
-        if ((p = kcalloc(1, sizeof(*p), GFP_KERNEL)) == NULL) {
+        if ((p = kzalloc(sizeof(*p), GFP_KERNEL)) == NULL) {
                 snd_device_free(chip->card, hw);
                 return -ENOMEM;
         }
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index e2cbc4202b3d..c41ac25e85ca 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -107,54 +107,47 @@ static int __init snd_sb8_probe(int dev)
                                     dma8[dev],
                                     -1,
                                     SB_HW_AUTO,
-                                    &chip)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+                                    &chip)) < 0)
+                goto _err;
+
         if (chip->hardware >= SB_HW_16) {
-                snd_card_free(card);
                 if (chip->hardware == SB_HW_ALS100)
-                        snd_printdd("ALS100 chip detected at 0x%lx, try snd-als100 module\n",
+                        snd_printk(KERN_WARNING "ALS100 chip detected at 0x%lx, try snd-als100 module\n",
                                     port[dev]);
                 else
-                        snd_printdd("SB 16 chip detected at 0x%lx, try snd-sb16 module\n",
-                                    port[dev]);
-                return -ENODEV;
+                        snd_printk(KERN_WARNING "SB 16 chip detected at 0x%lx, try snd-sb16 module\n",
+                                   port[dev]);
+                err = -ENODEV;
+                goto _err;
         }
 
-        if ((err = snd_sb8dsp_pcm(chip, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_sbmixer_new(chip)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_sb8dsp_pcm(chip, 0, NULL)) < 0)
+                goto _err;
+
+        if ((err = snd_sbmixer_new(chip)) < 0)
+                goto _err;
+
         if (chip->hardware == SB_HW_10 || chip->hardware == SB_HW_20) {
                 if ((err = snd_opl3_create(card, chip->port + 8, 0,
                                            OPL3_HW_AUTO, 1,
                                            &opl3)) < 0) {
-                        snd_printk(KERN_ERR "sb8: no OPL device at 0x%lx\n", chip->port + 8);
+                        snd_printk(KERN_WARNING "sb8: no OPL device at 0x%lx\n", chip->port + 8);
                 }
         } else {
                 if ((err = snd_opl3_create(card, chip->port, chip->port + 2,
                                            OPL3_HW_AUTO, 1,
                                            &opl3)) < 0) {
-                        snd_printk(KERN_ERR "sb8: no OPL device at 0x%lx-0x%lx\n",
+                        snd_printk(KERN_WARNING "sb8: no OPL device at 0x%lx-0x%lx\n",
                                    chip->port, chip->port + 2);
                 }
         }
         if (err >= 0) {
-                if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
+                if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0)
+                        goto _err;
         }
 
-        if ((err = snd_sb8dsp_midi(chip, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_sb8dsp_midi(chip, 0, NULL)) < 0)
+                goto _err;
 
         strcpy(card->driver, chip->hardware == SB_HW_PRO ? "SB Pro" : "SB8");
         strcpy(card->shortname, chip->name);
@@ -162,12 +155,19 @@ static int __init snd_sb8_probe(int dev)
                 chip->name,
                 chip->port,
                 irq[dev], dma8[dev]);
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto _err;
+
+        if ((err = snd_card_register(card)) < 0)
+                goto _err;
+
         snd_sb8_cards[dev] = card;
         return 0;
+
+ _err:
+        snd_card_free(card);
+        return err;
 }
 
 static int __init snd_card_sb8_legacy_auto_probe(unsigned long xport)
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index 5b6bde213ea0..f0f205ae425f 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -221,7 +221,7 @@ int snd_sbdsp_create(snd_card_t *card,
 
         snd_assert(r_chip != NULL, return -EINVAL);
         *r_chip = NULL;
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
                 return -ENOMEM;
         spin_lock_init(&chip->reg_lock);