ALSA: Return proper error code at probe in sound/pcmcia/*

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 14 insertions, 10 deletions

diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 087ded8a8d72..7445cc8a47d3 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -130,23 +130,26 @@ static struct snd_vx_hardware vxp440_hw = {
 /*
  * create vxpocket instance
  */
-static struct snd_vxpocket *snd_vxpocket_new(struct snd_card *card, int ibl,
-                                             struct pcmcia_device *link)
+static int snd_vxpocket_new(struct snd_card *card, int ibl,
+                            struct pcmcia_device *link,
+                            struct snd_vxpocket **chip_ret)
 {
         struct vx_core *chip;
         struct snd_vxpocket *vxp;
         static struct snd_device_ops ops = {
                 .dev_free =     snd_vxpocket_dev_free,
         };
+        int err;
 
         chip = snd_vx_create(card, &vxpocket_hw, &snd_vxpocket_ops,
                              sizeof(struct snd_vxpocket) - sizeof(struct vx_core));
-        if (! chip)
-                return NULL;
+        if (!chip)
+                return -ENOMEM;
 
-        if (snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops) < 0) {
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (err < 0) {
                 kfree(chip);
-                return NULL;
+                return err;
         }
         chip->ibl.size = ibl;
 
@@ -169,7 +172,8 @@ static struct snd_vxpocket *snd_vxpocket_new(struct snd_card *card, int ibl,
         link->conf.ConfigIndex = 1;
         link->conf.Present = PRESENT_OPTION;
 
-        return vxp;
+        *chip_ret = vxp;
+        return 0;
 }
 
 
@@ -313,10 +317,10 @@ static int vxpocket_probe(struct pcmcia_device *p_dev)
                 return err;
         }
 
-        vxp = snd_vxpocket_new(card, ibl[i], p_dev);
-        if (! vxp) {
+        err = snd_vxpocket_new(card, ibl[i], p_dev, &vxp);
+        if (err < 0) {
                 snd_card_free(card);
-                return -ENODEV;
+                return err;
         }
         card->private_data = vxp;