117 files changed, 645 insertions, 645 deletions
diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c
index 617850463582..0fa3855b4790 100644
--- a/sound/aoa/core/alsa.c
+++ b/sound/aoa/core/alsa.c
@@ -23,9 +23,10 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev)
                /* cannot be EEXIST due to usage in aoa_fabric_register */
                return -EBUSY;
-        alsa_card = snd_card_new(index, name, mod, sizeof(struct aoa_card));
+        err = snd_card_create(index, name, mod, sizeof(struct aoa_card),
-        if (!alsa_card)
+                              &alsa_card);
-                return -ENOMEM;
+        if (err < 0)
+                return err;
        aoa_card = alsa_card->private_data;
        aoa_card->alsa_card = alsa_card;
        alsa_card->dev = dev;
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 772901e41ecb..7fbd68fab944 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -995,10 +995,11 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
 {
        struct aaci *aaci;
        struct snd_card *card;
+        int err;
-        card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
+        err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
-                            THIS_MODULE, sizeof(struct aaci));
+                              THIS_MODULE, sizeof(struct aaci), &card);
-        if (card == NULL)
+        if (err < 0)
                return NULL;
        card->private_free = aaci_free_card;
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 85cf591d4e11..7ed100c80a5f 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -173,10 +173,9 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
        struct snd_ac97_template ac97_template;
        int ret;
-        ret = -ENOMEM;
+        ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
-        card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
+                              THIS_MODULE, 0, &card);
-                            THIS_MODULE, 0);
+        if (ret < 0)
-        if (!card)
                goto err;
        card->dev = &dev->dev;
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index 1dcd51d81d10..51d708c31e65 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -887,9 +887,10 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr)
        struct sa11xx_uda1341 *chip;
        /* register the soundcard */
-        card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct sa11xx_uda1341));
+        err = snd_card_create(-1, id, THIS_MODULE,
-        if (card == NULL)
+                              sizeof(struct sa11xx_uda1341), &card);
-                return -ENOMEM;
+        if (err < 0)
+                return err;
        chip = card->private_data;
        spin_lock_init(&chip->s[0].dma_lock);
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 195cafc5a553..a70ee7f1ed98 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -99,9 +99,6 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
        if (hw == NULL)
                return -ENODEV;
-        if (!hw->ops.open)
-                return -ENXIO;
        if (!try_module_get(hw->card->module))
                return -EFAULT;
@@ -113,6 +110,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
                        err = -EBUSY;
                        break;
                }
+                if (!hw->ops.open) {
+                        err = 0;
+                        break;
+                }
                err = hw->ops.open(hw, file);
                if (err >= 0)
                        break;
@@ -151,7 +152,7 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
 static int snd_hwdep_release(struct inode *inode, struct file * file)
 {
-        int err = -ENXIO;
+        int err = 0;
        struct snd_hwdep *hw = file->private_data;
        struct module *mod = hw->card->module;
diff --git a/sound/core/init.c b/sound/core/init.c
index 05c6da554cbf..fd56afe846ed 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -121,31 +121,44 @@ static inline int init_info_for_card(struct snd_card *card)
 #endif
 /**
- *  snd_card_new - create and initialize a soundcard structure
+ *  snd_card_create - create and initialize a soundcard structure
 *  @idx: card index (address) [0 ... (SNDRV_CARDS-1)]
 *  @xid: card identification (ASCII string)
 *  @module: top level module for locking
 *  @extra_size: allocate this extra size after the main soundcard structure
+ *  @card_ret: the pointer to store the created card instance
 *
 *  Creates and initializes a soundcard structure.
 *
- *  Returns kmallocated snd_card structure. Creates the ALSA control interface
+ *  The function allocates snd_card instance via kzalloc with the given
- *  (which is blocked until snd_card_register function is called).
+ *  space for the driver to use freely.  The allocated struct is stored
+ *  in the given card_ret pointer.
+ *
+ *  Returns zero if successful or a negative error code.
 */
-struct snd_card *snd_card_new(int idx, const char *xid,
+int snd_card_create(int idx, const char *xid,
-                         struct module *module, int extra_size)
+                    struct module *module, int extra_size,
+                    struct snd_card **card_ret)
 {
        struct snd_card *card;
        int err, idx2;
+        if (snd_BUG_ON(!card_ret))
+                return -EINVAL;
+        *card_ret = NULL;
        if (extra_size < 0)
                extra_size = 0;
        card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL);
-        if (card == NULL)
+        if (!card)
-                return NULL;
+                return -ENOMEM;
        if (xid) {
-                if (!snd_info_check_reserved_words(xid))
+                if (!snd_info_check_reserved_words(xid)) {
+                        snd_printk(KERN_ERR
+                                   "given id string '%s' is reserved.\n", xid);
+                        err = -EBUSY;
                        goto __error;
+                }
                strlcpy(card->id, xid, sizeof(card->id));
        }
        err = 0;
@@ -203,26 +216,28 @@ struct snd_card *snd_card_new(int idx, const char *xid,
 #endif
        /* the control interface cannot be accessed from the user space until */
        /* snd_cards_bitmask and snd_cards are set with snd_card_register */
-        if ((err = snd_ctl_create(card)) < 0) {
+        err = snd_ctl_create(card);
-                snd_printd("unable to register control minors\n");
+        if (err < 0) {
+                snd_printk(KERN_ERR "unable to register control minors\n");
                goto __error;
        }
-        if ((err = snd_info_card_create(card)) < 0) {
+        err = snd_info_card_create(card);
-                snd_printd("unable to create card info\n");
+        if (err < 0) {
+                snd_printk(KERN_ERR "unable to create card info\n");
                goto __error_ctl;
        }
        if (extra_size > 0)
                card->private_data = (char *)card + sizeof(struct snd_card);
-        return card;
+        *card_ret = card;
+        return 0;
      __error_ctl:
        snd_device_free_all(card, SNDRV_DEV_CMD_PRE);
      __error:
        kfree(card);
-        return NULL;
+        return err;
 }
+EXPORT_SYMBOL(snd_card_create);
-EXPORT_SYMBOL(snd_card_new);
 /* return non-zero if a card is already locked */
 int snd_card_locked(int card)
diff --git a/sound/core/jack.c b/sound/core/jack.c
index 077a85262c1c..c8254c667c62 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -23,6 +23,14 @@
 #include <sound/jack.h>
 #include <sound/core.h>
+static int jack_types[] = {
+        SW_HEADPHONE_INSERT,
+        SW_MICROPHONE_INSERT,
+        SW_LINEOUT_INSERT,
+        SW_JACK_PHYSICAL_INSERT,
+        SW_VIDEOOUT_INSERT,
+};
 static int snd_jack_dev_free(struct snd_device *device)
 {
        struct snd_jack *jack = device->device_data;
@@ -79,6 +87,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
 {
        struct snd_jack *jack;
        int err;
+        int i;
        static struct snd_device_ops ops = {
                .dev_free = snd_jack_dev_free,
                .dev_register = snd_jack_dev_register,
@@ -100,18 +109,10 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
        jack->type = type;
-        if (type & SND_JACK_HEADPHONE)
+        for (i = 0; i < ARRAY_SIZE(jack_types); i++)
-                input_set_capability(jack->input_dev, EV_SW,
+                if (type & (1 << i))
-                                     SW_HEADPHONE_INSERT);
+                        input_set_capability(jack->input_dev, EV_SW,
-        if (type & SND_JACK_LINEOUT)
+                                             jack_types[i]);
-                input_set_capability(jack->input_dev, EV_SW,
-                                     SW_LINEOUT_INSERT);
-        if (type & SND_JACK_MICROPHONE)
-                input_set_capability(jack->input_dev, EV_SW,
-                                     SW_MICROPHONE_INSERT);
-        if (type & SND_JACK_MECHANICAL)
-                input_set_capability(jack->input_dev, EV_SW,
-                                     SW_JACK_PHYSICAL_INSERT);
        err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);
        if (err < 0)
@@ -154,21 +155,17 @@ EXPORT_SYMBOL(snd_jack_set_parent);
 */
 void snd_jack_report(struct snd_jack *jack, int status)
 {
+        int i;
        if (!jack)
                return;
-        if (jack->type & SND_JACK_HEADPHONE)
+        for (i = 0; i < ARRAY_SIZE(jack_types); i++) {
-                input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT,
+                int testbit = 1 << i;
-                                    status & SND_JACK_HEADPHONE);
+                if (jack->type & testbit)
-        if (jack->type & SND_JACK_LINEOUT)
+                        input_report_switch(jack->input_dev, jack_types[i],
-                input_report_switch(jack->input_dev, SW_LINEOUT_INSERT,
+                                            status & testbit);
-                                    status & SND_JACK_LINEOUT);
+        }
-        if (jack->type & SND_JACK_MICROPHONE)
-                input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT,
-                                    status & SND_JACK_MICROPHONE);
-        if (jack->type & SND_JACK_MECHANICAL)
-                input_report_switch(jack->input_dev, SW_JACK_PHYSICAL_INSERT,
-                                    status & SND_JACK_MECHANICAL);
        input_sync(jack->input_dev);
 }
diff --git a/sound/core/misc.c b/sound/core/misc.c
index 38524f615d94..a9710e0c97af 100644
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -95,12 +95,14 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list)
 {
        const struct snd_pci_quirk *q;
-        for (q = list; q->subvendor; q++)
+        for (q = list; q->subvendor; q++) {
-                if (q->subvendor == pci->subsystem_vendor &&
+                if (q->subvendor != pci->subsystem_vendor)
-                    (!q->subdevice || q->subdevice == pci->subsystem_device))
+                        continue;
+                if (!q->subdevice ||
+                    (pci->subsystem_device & q->subdevice_mask) == q->subdevice)
                        return q;
+        }
        return NULL;
 }
 EXPORT_SYMBOL(snd_pci_quirk_lookup);
 #endif
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 4690b8b5681f..e570649184e2 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -692,6 +692,9 @@ static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer,
                snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PVOLUME], left, right);
                if (slot->present & SNDRV_MIXER_OSS_PRESENT_CVOLUME)
                        snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CVOLUME], left, right);
+        } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_CVOLUME) {
+                snd_mixer_oss_put_volume1_vol(fmixer, pslot,
+                        slot->numid[SNDRV_MIXER_OSS_ITEM_CVOLUME], left, right);
        } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GVOLUME) {
                snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GVOLUME], left, right);
        } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GLOBAL) {
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 0a1798eafb0b..699d2890535c 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2872,7 +2872,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,
                        setup = kmalloc(sizeof(*setup), GFP_KERNEL);
                        if (! setup) {
                                buffer->error = -ENOMEM;
-                                mutex_lock(&pstr->oss.setup_mutex);
+                                mutex_unlock(&pstr->oss.setup_mutex);
                                return;
                        }
                        if (pstr->oss.setup_list == NULL)
@@ -2886,7 +2886,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,
                        if (! template.task_name) {
                                kfree(setup);
                                buffer->error = -ENOMEM;
-                                mutex_lock(&pstr->oss.setup_mutex);
+                                mutex_unlock(&pstr->oss.setup_mutex);
                                return;
                        }
                }
diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c
index d4564edd61d7..4e7ec2b49873 100644
--- a/sound/core/sgbuf.c
+++ b/sound/core/sgbuf.c
@@ -38,6 +38,10 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
        if (! sgbuf)
                return -EINVAL;
+        if (dmab->area)
+                vunmap(dmab->area);
+        dmab->area = NULL;
        tmpb.dev.type = SNDRV_DMA_TYPE_DEV;
        tmpb.dev.dev = sgbuf->dev;
        for (i = 0; i < sgbuf->pages; i++) {
@@ -48,9 +52,6 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
                tmpb.bytes = (sgbuf->table[i].addr & ~PAGE_MASK) << PAGE_SHIFT;
                snd_dma_free_pages(&tmpb);
        }
-        if (dmab->area)
-                vunmap(dmab->area);
-        dmab->area = NULL;
        kfree(sgbuf->table);
        kfree(sgbuf->page_table);
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 73be7e14a603..54239d2e0997 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -588,10 +588,10 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
        int idx, err;
        int dev = devptr->id;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_dummy));
+                              sizeof(struct snd_dummy), &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        dummy = card->private_data;
        dummy->card = card;
        for (idx = 0; idx < MAX_PCM_DEVICES && idx < pcm_devs[dev]; idx++) {
diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c
index 7783843ca9ae..1950ffce2b54 100644
--- a/sound/drivers/ml403-ac97cr.c
+++ b/sound/drivers/ml403-ac97cr.c
@@ -1279,9 +1279,9 @@ static int __devinit snd_ml403_ac97cr_probe(struct platform_device *pfdev)
        if (!enable[dev])
                return -ENOENT;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = snd_ml403_ac97cr_create(card, pfdev, &ml403_ac97cr);
        if (err < 0) {
                PDEBUG(INIT_FAILURE, "probe(): create failed!\n");
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 5b996f3faba5..149d05a8202d 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -73,9 +73,9 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
                snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");
        *rcard = NULL;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "MPU-401 UART");
        strcpy(card->shortname, card->driver);
        sprintf(card->longname, "%s at %#lx, ", card->shortname, port[dev]);
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 48b64e6b2670..0e17d2b5ce19 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -696,9 +696,9 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev)
        int err;
        struct mtpav *mtp_card;
-        card = snd_card_new(index, id, THIS_MODULE, sizeof(*mtp_card));
+        err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        mtp_card = card->private_data;
        spin_lock_init(&mtp_card->spinlock);
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 87ba1ddc0115..33d9db782e07 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -957,10 +957,10 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev)
        if ((err = snd_mts64_probe_port(p)) < 0)
                return err;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL) {
+        if (err < 0) {
                snd_printd("Cannot create card\n");
-                return -ENOMEM;
+                return err;
        }
        strcpy(card->driver, DRIVER_NAME);
        strcpy(card->shortname, "ESI " CARD_NAME);
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index a4049eb94d35..aa2ae07a76d5 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -98,9 +98,9 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)
        hrtimer_init(&pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        pcsp_chip.timer.function = pcsp_do_timer;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (!card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = snd_pcsp_create(card);
        if (err < 0) {
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index b1c047ec19af..60158e2e0eaf 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -746,10 +746,10 @@ static int __devinit snd_portman_probe(struct platform_device *pdev)
        if ((err = snd_portman_probe_port(p)) < 0)
                return err;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL) {
+        if (err < 0) {
                snd_printd("Cannot create card\n");
-                return -ENOMEM;
+                return err;
        }
        strcpy(card->driver, DRIVER_NAME);
        strcpy(card->shortname, CARD_NAME);
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index d8aab9da97c2..891d081e4825 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -936,9 +936,9 @@ static int __devinit snd_serial_probe(struct platform_device *devptr)
                return -ENODEV;
        }
-        card  = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err  = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "Serial");
        strcpy(card->shortname, "Serial MIDI (UART16550A)");
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index f79e3614079d..6f48711818f3 100644
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -90,10 +90,10 @@ static int __devinit snd_virmidi_probe(struct platform_device *devptr)
        int idx, err;
        int dev = devptr->id;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_card_virmidi));
+                              sizeof(struct snd_card_virmidi), &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        vmidi = (struct snd_card_virmidi *)card->private_data;
        vmidi->card = card;
diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c
index 8d6362e2d4c9..46df8817c18f 100644
--- a/sound/drivers/vx/vx_hwdep.c
+++ b/sound/drivers/vx/vx_hwdep.c
@@ -119,16 +119,6 @@ void snd_vx_free_firmware(struct vx_core *chip)
 #else /* old style firmware loading */
-static int vx_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-static int vx_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
 static int vx_hwdep_dsp_status(struct snd_hwdep *hw,
                               struct snd_hwdep_dsp_status *info)
 {
@@ -243,8 +233,6 @@ int snd_vx_setup_firmware(struct vx_core *chip)
        hw->iface = SNDRV_HWDEP_IFACE_VX;
        hw->private_data = chip;
-        hw->ops.open = vx_hwdep_open;
-        hw->ops.release = vx_hwdep_release;
        hw->ops.dsp_status = vx_hwdep_dsp_status;
        hw->ops.dsp_load = vx_hwdep_dsp_load;
        hw->exclusive = 1;
diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 77524244a846..9660e598232c 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -157,9 +157,10 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
        struct snd_ad1816a *chip;
        struct snd_opl3 *opl3;
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct snd_card_ad1816a))) == NULL)
+                                sizeof(struct snd_card_ad1816a), &card);
-                return -ENOMEM;
+        if (error < 0)
+                return error;
        acard = (struct snd_card_ad1816a *)card->private_data;
        if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index 223a6c038819..4beeb6f98e0e 100644
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
@@ -91,9 +91,9 @@ static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)
        struct snd_pcm *pcm;
        int error;
-        card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
+        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
-        if (!card)
+        if (error < 0)
-                return -EINVAL;
+                return error;
        error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], -1,
                        thinkpad[n] ? WSS_HW_THINKPAD : WSS_HW_DETECT,
diff --git a/sound/isa/adlib.c b/sound/isa/adlib.c
index 374b7177e111..7465ae036e0b 100644
--- a/sound/isa/adlib.c
+++ b/sound/isa/adlib.c
@@ -53,10 +53,10 @@ static int __devinit snd_adlib_probe(struct device *dev, unsigned int n)
        struct snd_opl3 *opl3;
        int error;
-        card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
+        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
-        if (!card) {
+        if (error < 0) {
                dev_err(dev, "could not create card\n");
-                return -EINVAL;
+                return error;
        }
        card->private_data = request_region(port[n], 4, CRD_NAME);
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index f1ce30f379c9..5fd52e4d7079 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -163,9 +163,10 @@ static int __devinit snd_card_als100_probe(int dev,
        struct snd_card_als100 *acard;
        struct snd_opl3 *opl3;
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct snd_card_als100))) == NULL)
+                                sizeof(struct snd_card_als100), &card);
-                return -ENOMEM;
+        if (error < 0)
+                return error;
        acard = card->private_data;
        if ((error = snd_card_als100_pnp(dev, acard, pcard, pid))) {
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index 3e74d1a3928e..f7aa637b0d18 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -184,9 +184,10 @@ static int __devinit snd_card_azt2320_probe(int dev,
        struct snd_wss *chip;
        struct snd_opl3 *opl3;
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct snd_card_azt2320))) == NULL)
+                                sizeof(struct snd_card_azt2320), &card);
-                return -ENOMEM;
+        if (error < 0)
+                return error;
        acard = (struct snd_card_azt2320 *)card->private_data;
        if ((error = snd_card_azt2320_pnp(dev, acard, pcard, pid))) {
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index e49aec700a55..24e60902f8ca 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -467,20 +467,22 @@ static int snd_cmi8330_resume(struct snd_card *card)
 #define PFX     "cmi8330: "
-static struct snd_card *snd_cmi8330_card_new(int dev)
+static int snd_cmi8330_card_new(int dev, struct snd_card **cardp)
 {
        struct snd_card *card;
        struct snd_cmi8330 *acard;
+        int err;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_cmi8330));
+                              sizeof(struct snd_cmi8330), &card);
-        if (card == NULL) {
+        if (err < 0) {
                snd_printk(KERN_ERR PFX "could not get a new card\n");
-                return NULL;
+                return err;
        }
        acard = card->private_data;
        acard->card = card;
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
@@ -564,9 +566,9 @@ static int __devinit snd_cmi8330_isa_probe(struct device *pdev,
        struct snd_card *card;
        int err;
-        card = snd_cmi8330_card_new(dev);
+        err = snd_cmi8330_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        snd_card_set_dev(card, pdev);
        if ((err = snd_cmi8330_probe(card, dev)) < 0) {
                snd_card_free(card);
@@ -628,9 +630,9 @@ static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
                               
-        card = snd_cmi8330_card_new(dev);
+        res = snd_cmi8330_card_new(dev, &card);
-        if (! card)
+        if (res < 0)
-                return -ENOMEM;
+                return res;
        if ((res = snd_cmi8330_pnp(dev, card->private_data, pcard, pid)) < 0) {
                snd_printk(KERN_ERR PFX "PnP detection failed\n");
                snd_card_free(card);
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index f019d449e2d6..cb9153e75b82 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -95,9 +95,9 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n)
        struct snd_pcm *pcm;
        int error;
-        card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
+        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
-        if (!card)
+        if (error < 0)
-                return -EINVAL;
+                return error;
        error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], dma2[n],
                        WSS_HW_DETECT, 0, &chip);
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 019c9401663e..f7845986f467 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -382,16 +382,18 @@ static void snd_card_cs4236_free(struct snd_card *card)
        release_and_free_resource(acard->res_sb_port);
 }
-static struct snd_card *snd_cs423x_card_new(int dev)
+static int snd_cs423x_card_new(int dev, struct snd_card **cardp)
 {
        struct snd_card *card;
+        int err;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_card_cs4236));
+                              sizeof(struct snd_card_cs4236), &card);
-        if (card == NULL)
+        if (err < 0)
-                return NULL;
+                return err;
        card->private_free = snd_card_cs4236_free;
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
@@ -512,9 +514,9 @@ static int __devinit snd_cs423x_isa_probe(struct device *pdev,
        struct snd_card *card;
        int err;
-        card = snd_cs423x_card_new(dev);
+        err = snd_cs423x_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        snd_card_set_dev(card, pdev);
        if ((err = snd_cs423x_probe(card, dev)) < 0) {
                snd_card_free(card);
@@ -594,9 +596,9 @@ static int __devinit snd_cs4232_pnpbios_detect(struct pnp_dev *pdev,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
-        card = snd_cs423x_card_new(dev);
+        err = snd_cs423x_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_card_cs4232_pnp(dev, card->private_data, pdev)) < 0) {
                printk(KERN_ERR "PnP BIOS detection failed for " IDENT "\n");
                snd_card_free(card);
@@ -656,9 +658,9 @@ static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
-        card = snd_cs423x_card_new(dev);
+        res = snd_cs423x_card_new(dev, &card);
-        if (! card)
+        if (res < 0)
-                return -ENOMEM;
+                return res;
        if ((res = snd_card_cs423x_pnpc(dev, card->private_data, pcard, pid)) < 0) {
                printk(KERN_ERR "isapnp detection failed and probing for " IDENT
                       " is not supported\n");
diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c
index a0242c3b613e..80f5b1af9be8 100644
--- a/sound/isa/dt019x.c
+++ b/sound/isa/dt019x.c
@@ -150,9 +150,10 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
        struct snd_card_dt019x *acard;
        struct snd_opl3 *opl3;
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct snd_card_dt019x))) == NULL)
+                                sizeof(struct snd_card_dt019x), &card);
-                return -ENOMEM;
+        if (error < 0)
+                return error;
        acard = card->private_data;
        snd_card_set_dev(card, &pcard->card->dev);
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index b46377139cf8..d746750410ea 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -122,9 +122,9 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n)
        struct snd_pcm *pcm;
        int error;
-        card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
+        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
-        if (!card)
+        if (error < 0)
-                return -EINVAL;
+                return error;
        error = snd_es1688_legacy_create(card, dev, n, &chip);
        if (error < 0)
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 90498e4ca260..8cfbff73a835 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -2125,10 +2125,10 @@ static int __devinit snd_audiodrive_pnpc(int dev, struct snd_audiodrive *acard,
 #define is_isapnp_selected(dev)         0
 #endif
-static struct snd_card *snd_es18xx_card_new(int dev)
+static int snd_es18xx_card_new(int dev, struct snd_card **cardp)
 {
-        return snd_card_new(index[dev], id[dev], THIS_MODULE,
+        return snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_audiodrive));
+                               sizeof(struct snd_audiodrive), cardp);
 }
 static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
@@ -2197,9 +2197,9 @@ static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr)
        struct snd_card *card;
        int err;
-        card = snd_es18xx_card_new(dev);
+        err = snd_es18xx_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        snd_card_set_dev(card, devptr);
        if ((err = snd_audiodrive_probe(card, dev)) < 0) {
                snd_card_free(card);
@@ -2303,9 +2303,9 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
-        card = snd_es18xx_card_new(dev);
+        err = snd_es18xx_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_audiodrive_pnp(dev, card->private_data, pdev)) < 0) {
                snd_card_free(card);
                return err;
@@ -2362,9 +2362,9 @@ static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
-        card = snd_es18xx_card_new(dev);
+        res = snd_es18xx_card_new(dev, &card);
-        if (! card)
+        if (res < 0)
-                return -ENOMEM;
+                return res;
        if ((res = snd_audiodrive_pnpc(dev, card->private_data, pcard, pid)) < 0) {
                snd_card_free(card);
diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c
index 426532a4d730..086b8f0e0f94 100644
--- a/sound/isa/gus/gusclassic.c
+++ b/sound/isa/gus/gusclassic.c
@@ -148,9 +148,9 @@ static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n)
        struct snd_gus_card *gus;
        int error;
-        card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
+        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
-        if (!card)
+        if (error < 0)
-                return -EINVAL;
+                return error;
        if (pcm_channels[n] < 2)
                pcm_channels[n] = 2;
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 7ad4c3b41a84..180a8dea6bd9 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -241,9 +241,9 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
        struct snd_opl3 *opl3;
        int error;
-        card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
+        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
-        if (!card)
+        if (error < 0)
-                return -EINVAL;
+                return error;
        if (mpu_port[n] == SNDRV_AUTO_PORT)
                mpu_port[n] = 0;
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index f94c1976e632..f26eac8d8110 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -214,10 +214,10 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
        struct snd_wss *wss;
        struct snd_gusmax *maxcard;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_gusmax));
+                              sizeof(struct snd_gusmax), &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        card->private_free = snd_gusmax_free;
        maxcard = (struct snd_gusmax *)card->private_data;
        maxcard->card = card;
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 5faecfb602d3..50e429a120da 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -626,20 +626,22 @@ static void snd_interwave_free(struct snd_card *card)
                free_irq(iwcard->irq, (void *)iwcard);
 }
-static struct snd_card *snd_interwave_card_new(int dev)
+static int snd_interwave_card_new(int dev, struct snd_card **cardp)
 {
        struct snd_card *card;
        struct snd_interwave *iwcard;
+        int err;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_interwave));
+                              sizeof(struct snd_interwave), &card);
-        if (card == NULL)
+        if (err < 0)
-                return NULL;
+                return err;
        iwcard = card->private_data;
        iwcard->card = card;
        iwcard->irq = -1;
        card->private_free = snd_interwave_free;
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
@@ -778,9 +780,9 @@ static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr)
        struct snd_card *card;
        int err;
-        card = snd_interwave_card_new(dev);
+        err = snd_interwave_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        snd_card_set_dev(card, devptr);
        if ((err = snd_interwave_probe(card, dev)) < 0) {
@@ -876,9 +878,9 @@ static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
                                
-        card = snd_interwave_card_new(dev);
+        res = snd_interwave_card_new(dev, &card);
-        if (! card)
+        if (res < 0)
-                return -ENOMEM;
+                return res;
        if ((res = snd_interwave_pnp(dev, card->private_data, pcard, pid)) < 0) {
                snd_card_free(card);
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 58c972b2af03..63e51373ddc7 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -550,21 +550,27 @@ static int __devinit snd_opl3sa2_mixer(struct snd_card *card)
 #ifdef CONFIG_PM
 static int snd_opl3sa2_suspend(struct snd_card *card, pm_message_t state)
 {
-        struct snd_opl3sa2 *chip = card->private_data;
+        if (card) {
+                struct snd_opl3sa2 *chip = card->private_data;
-        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+                snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        chip->wss->suspend(chip->wss);
+                chip->wss->suspend(chip->wss);
-        /* power down */
+                /* power down */
-        snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
+                snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
+        }
        return 0;
 }
 static int snd_opl3sa2_resume(struct snd_card *card)
 {
-        struct snd_opl3sa2 *chip = card->private_data;
+        struct snd_opl3sa2 *chip;
        int i;
+        if (!card)
+                return 0;
+        chip = card->private_data;
        /* power up */
        snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D0);
@@ -617,21 +623,24 @@ static void snd_opl3sa2_free(struct snd_card *card)
        release_and_free_resource(chip->res_port);
 }
-static struct snd_card *snd_opl3sa2_card_new(int dev)
+static int snd_opl3sa2_card_new(int dev, struct snd_card **cardp)
 {
        struct snd_card *card;
        struct snd_opl3sa2 *chip;
+        int err;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct snd_opl3sa2));
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-        if (card == NULL)
+                              sizeof(struct snd_opl3sa2), &card);
-                return NULL;
+        if (err < 0)
+                return err;
        strcpy(card->driver, "OPL3SA2");
        strcpy(card->shortname, "Yamaha OPL3-SA2");
        chip = card->private_data;
        spin_lock_init(&chip->reg_lock);
        chip->irq = -1;
        card->private_free = snd_opl3sa2_free;
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
@@ -723,9 +732,9 @@ static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
-        card = snd_opl3sa2_card_new(dev);
+        err = snd_opl3sa2_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_opl3sa2_pnp(dev, card->private_data, pdev)) < 0) {
                snd_card_free(card);
                return err;
@@ -789,9 +798,9 @@ static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
-        card = snd_opl3sa2_card_new(dev);
+        err = snd_opl3sa2_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_opl3sa2_pnp(dev, card->private_data, pdev)) < 0) {
                snd_card_free(card);
                return err;
@@ -870,9 +879,9 @@ static int __devinit snd_opl3sa2_isa_probe(struct device *pdev,
        struct snd_card *card;
        int err;
-        card = snd_opl3sa2_card_new(dev);
+        err = snd_opl3sa2_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        snd_card_set_dev(card, pdev);
        if ((err = snd_opl3sa2_probe(card, dev)) < 0) {
                snd_card_free(card);
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 440755cc0013..02e30d7c6a93 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -1228,9 +1228,10 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n)
        struct snd_pcm *pcm;
        struct snd_rawmidi *rmidi;
-        if (!(card = snd_card_new(index, id, THIS_MODULE,
+        error = snd_card_create(index, id, THIS_MODULE,
-                                  sizeof(struct snd_miro))))
+                                sizeof(struct snd_miro), &card);
-                return -ENOMEM;
+        if (error < 0)
+                return error;
        card->private_free = snd_card_miro_free;
        miro = card->private_data;
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 19706b0d8497..cd6e60a6a4ea 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -830,15 +830,18 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
        return snd_card_register(card);
 }
-static struct snd_card *snd_opti9xx_card_new(void)
+static int snd_opti9xx_card_new(struct snd_card **cardp)
 {
        struct snd_card *card;
+        int err;
-        card = snd_card_new(index, id, THIS_MODULE, sizeof(struct snd_opti9xx));
+        err = snd_card_create(index, id, THIS_MODULE,
-        if (! card)
+                              sizeof(struct snd_opti9xx), &card);
-                return NULL;
+        if (err < 0)
+                return err;
        card->private_free = snd_card_opti9xx_free;
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int __devinit snd_opti9xx_isa_match(struct device *devptr,
@@ -903,9 +906,9 @@ static int __devinit snd_opti9xx_isa_probe(struct device *devptr,
        }
 #endif
-        card = snd_opti9xx_card_new();
+        error = snd_opti9xx_card_new(&card);
-        if (! card)
+        if (error < 0)
-                return -ENOMEM;
+                return error;
        if ((error = snd_card_opti9xx_detect(card, card->private_data)) < 0) {
                snd_card_free(card);
@@ -950,9 +953,9 @@ static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
                return -EBUSY;
        if (! isapnp)
                return -ENODEV;
-        card = snd_opti9xx_card_new();
+        error = snd_opti9xx_card_new(&card);
-        if (! card)
+        if (error < 0)
-                return -ENOMEM;
+                return error;
        chip = card->private_data;
        hw = snd_card_opti9xx_pnp(chip, pcard, pid);
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index c8c8e214c843..cafc3a7316a8 100644
--- a/sound/isa/sb/es968.c
+++ b/sound/isa/sb/es968.c
@@ -108,9 +108,10 @@ static int __devinit snd_card_es968_probe(int dev,
        struct snd_card *card;
        struct snd_card_es968 *acard;
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct snd_card_es968))) == NULL)
+                                sizeof(struct snd_card_es968), &card);
-                return -ENOMEM;
+        if (error < 0)
+                return error;
        acard = card->private_data;
        if ((error = snd_card_es968_pnp(dev, acard, pcard, pid))) {
                snd_card_free(card);
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 2c201f78ce50..519c36346dec 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -324,14 +324,18 @@ static void snd_sb16_free(struct snd_card *card)
 #define is_isapnp_selected(dev)         0
 #endif
-static struct snd_card *snd_sb16_card_new(int dev)
+static int snd_sb16_card_new(int dev, struct snd_card **cardp)
 {
-        struct snd_card *card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        struct snd_card *card;
-                                        sizeof(struct snd_card_sb16));
+        int err;
-        if (card == NULL)
-                return NULL;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct snd_card_sb16), &card);
+        if (err < 0)
+                return err;
        card->private_free = snd_sb16_free;
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int __devinit snd_sb16_probe(struct snd_card *card, int dev)
@@ -489,9 +493,9 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev)
        struct snd_card *card;
        int err;
-        card = snd_sb16_card_new(dev);
+        err = snd_sb16_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        acard = card->private_data;
        /* non-PnP FM port address is hardwired with base port address */
@@ -610,9 +614,9 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,
        for ( ; dev < SNDRV_CARDS; dev++) {
                if (!enable[dev] || !isapnp[dev])
                        continue;
-                card = snd_sb16_card_new(dev);
+                res = snd_sb16_card_new(dev, &card);
-                if (! card)
+                if (res < 0)
-                        return -ENOMEM;
+                        return res;
                snd_card_set_dev(card, &pcard->card->dev);
                if ((res = snd_card_sb16_pnp(dev, card->private_data, pcard, pid)) < 0 ||
                    (res = snd_sb16_probe(card, dev)) < 0) {
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index ea06877be4b1..3cd57ee54660 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -103,10 +103,10 @@ static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev)
        struct snd_opl3 *opl3;
        int err;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_sb8));
+                              sizeof(struct snd_sb8), &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        acard = card->private_data;
        card->private_free = snd_sb8_free;
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
index ca35924dc3b3..7a1470376c6d 100644
--- a/sound/isa/sc6000.c
+++ b/sound/isa/sc6000.c
@@ -489,9 +489,9 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev)
        char __iomem *vmss_port;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (!card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if (xirq == SNDRV_AUTO_IRQ) {
                xirq = snd_legacy_find_free_irq(possible_irqs);
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index 2c7503bf1271..6fe27b9d9440 100644
--- a/sound/isa/sgalaxy.c
+++ b/sound/isa/sgalaxy.c
@@ -243,9 +243,9 @@ static int __devinit snd_sgalaxy_probe(struct device *devptr, unsigned int dev)
        struct snd_card *card;
        struct snd_wss *chip;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        xirq = irq[dev];
        if (xirq == SNDRV_AUTO_IRQ) {
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 48a16d865834..4025fb558c50 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -1357,10 +1357,10 @@ static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev)
        struct soundscape *sscape;
        int ret;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        ret = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct soundscape));
+                              sizeof(struct soundscape), &card);
-        if (!card)
+        if (ret < 0)
-                return -ENOMEM;
+                return ret;
        sscape = get_card_soundscape(card);
        sscape->type = SSCAPE;
@@ -1462,10 +1462,10 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard,
         * Create a new ALSA sound card entry, in anticipation
         * of detecting our hardware ...
         */
-        card = snd_card_new(index[idx], id[idx], THIS_MODULE,
+        ret = snd_card_create(index[idx], id[idx], THIS_MODULE,
-                            sizeof(struct soundscape));
+                              sizeof(struct soundscape), &card);
-        if (!card)
+        if (ret < 0)
-                return -ENOMEM;
+                return ret;
        sscape = get_card_soundscape(card);
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 4c095bc7c729..95898b2b7b58 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -338,15 +338,16 @@ snd_wavefront_free(struct snd_card *card)
        }
 }
-static struct snd_card *snd_wavefront_card_new(int dev)
+static int snd_wavefront_card_new(int dev, struct snd_card **cardp)
 {
        struct snd_card *card;
        snd_wavefront_card_t *acard;
+        int err;
-        card = snd_card_new (index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                             sizeof(snd_wavefront_card_t));
+                              sizeof(snd_wavefront_card_t), &card);
-        if (card == NULL)
+        if (err < 0)
-                return NULL;
+                return err;
        acard = card->private_data;
        acard->wavefront.irq = -1;
@@ -357,7 +358,8 @@ static struct snd_card *snd_wavefront_card_new(int dev)
        acard->wavefront.card = card;
        card->private_free = snd_wavefront_free;
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int __devinit
@@ -567,9 +569,9 @@ static int __devinit snd_wavefront_isa_probe(struct device *pdev,
        struct snd_card *card;
        int err;
-        card = snd_wavefront_card_new(dev);
+        err = snd_wavefront_card_new(dev, &card);
-        if (! card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        snd_card_set_dev(card, pdev);
        if ((err = snd_wavefront_probe(card, dev)) < 0) {
                snd_card_free(card);
@@ -616,9 +618,9 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
        if (dev >= SNDRV_CARDS)
                return -ENODEV;
-        card = snd_wavefront_card_new(dev);
+        res = snd_wavefront_card_new(dev, &card);
-        if (! card)
+        if (res < 0)
-                return -ENOMEM;
+                return res;
        if (snd_wavefront_pnp (dev, card->private_data, pcard, pid) < 0) {
                if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index 1881cec11e78..99e1391b2eb4 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -636,9 +636,10 @@ au1000_init(void)
        struct snd_card *card;
        struct snd_au1000 *au1000;
-        card = snd_card_new(-1, "AC97", THIS_MODULE, sizeof(struct snd_au1000));
+        err = snd_card_create(-1, "AC97", THIS_MODULE,
-        if (card == NULL)
+                              sizeof(struct snd_au1000), &card);
-                return -ENOMEM;
+        if (err < 0)
+                return err;
        card->private_free = snd_au1000_free;
        au1000 = card->private_data;
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index db495be01861..c52691c2fc46 100644
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -878,9 +878,9 @@ static int __devinit hal2_probe(struct platform_device *pdev)
        struct snd_hal2 *chip;
        int err;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = hal2_create(card, &chip);
        if (err < 0) {
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index 4c63504348dc..66f3b48ceafc 100644
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -936,9 +936,9 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)
        struct snd_sgio2audio *chip;
        int err;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = snd_sgio2audio_create(card, &chip);
        if (err < 0) {
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 41f870f8a11d..6055fd6d3b38 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -975,9 +975,9 @@ snd_harmony_probe(struct parisc_device *padev)
        struct snd_card *card;
        struct snd_harmony *h;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = snd_harmony_create(card, padev, &h);
        if (err < 0)
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index a7f38e63303f..d1f242bd0ac5 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -995,10 +995,10 @@ snd_ad1889_probe(struct pci_dev *pci,
        }
        /* (2) */
-        card = snd_card_new(index[devno], id[devno], THIS_MODULE, 0);
+        err = snd_card_create(index[devno], id[devno], THIS_MODULE, 0, &card);
        /* XXX REVISIT: we can probably allocate chip in this call */
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "AD1889");
        strcpy(card->shortname, "Analog Devices AD1889");
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 1a0fd65ec280..b36c551da566 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2307,9 +2307,9 @@ static int __devinit snd_ali_probe(struct pci_dev *pci,
        snd_ali_printk("probe ...\n");
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (!card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = snd_ali_create(card, pci, pcm_channels, spdif, &codec);
        if (err < 0)
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 8df6824b51cd..f557c155db48 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -812,10 +812,10 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        chip_type = pci_id->driver_data;
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index ba570053d4d5..542a0c65a92c 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -889,12 +889,13 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,
        pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO);
        pci_set_master(pci);
        
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 
-                            sizeof(*acard) /* private_data: acard */);
+                              sizeof(*acard) /* private_data: acard */,
-        if (card == NULL) {
+                              &card);
+        if (err < 0) {
                pci_release_regions(pci);
                pci_disable_device(pci);
-                return -ENOMEM;
+                return err;
        }
        acard = card->private_data;
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 226fe8237d31..9ce8548c03e4 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1645,9 +1645,9 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
        struct atiixp *chip;
        int err;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA");
        strcpy(card->shortname, "ATI IXP");
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 0e6e5cc1c501..c3136cccc559 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1288,9 +1288,9 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
        struct atiixp_modem *chip;
        int err;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "ATIIXP-MODEM");
        strcpy(card->shortname, "ATI IXP Modem");
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index a36d4d1fd419..9ec122383eef 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -250,9 +250,9 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                return -ENOENT;
        }
        // (2)
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        // (3)
        if ((err = snd_vortex_create(card, pci, &chip)) < 0) {
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index c7c54e7748e9..8eea29fc42fe 100644
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -368,9 +368,9 @@ static int __devinit snd_aw2_probe(struct pci_dev *pci,
        }
        /* (2) Create card instance */
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        /* (3) Create main component */
        err = snd_aw2_create(card, pci, &chip);
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 333007c523a1..1df96e76c483 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -2216,9 +2216,9 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "AZF3328");
        strcpy(card->shortname, "Aztech AZF3328 (PCI168)");
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 1aa1c0402540..a299340519df 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -888,9 +888,9 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (!card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = snd_bt87x_create(card, pci, &chip);
        if (err < 0)
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 0e62205d4081..b116456e7707 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1707,9 +1707,9 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = snd_ca0106_create(dev, card, pci, &chip);
        if (err < 0)
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 1a74ca62c314..c7899c32aba1 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -3272,9 +3272,9 @@ static int __devinit snd_cmipci_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        
        switch (pci->device) {
        case PCI_DEVICE_ID_CMEDIA_CM8738:
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 192e7842e181..b9b07f464631 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1925,9 +1925,9 @@ static int __devinit snd_cs4281_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) {
                snd_card_free(card);
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index e876b3263e46..c9b3e3d48cbc 100644
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -88,9 +88,9 @@ static int __devinit snd_card_cs46xx_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_cs46xx_create(card, pci,
                                     external_amp[dev], thinkpad[dev],
                                     &chip)) < 0) {
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 6dea5b5cc774..dc464321d0f3 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -258,10 +258,10 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        err = snd_cs5530_create(card, pci, &chip);
        if (err < 0) {
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 826e6dec2e97..ac1d72e0a1e4 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -353,9 +353,9 @@ static int __devinit snd_cs5535audio_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_cs5535audio_create(card, pci, &cs5535au)) < 0)
                goto probefail_out;
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 8dbc5c4ba421..9d015a76eb69 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -1997,9 +1997,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,
        DE_INIT(("Echoaudio driver starting...\n"));
        i = 0;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        snd_card_set_dev(card, &pci->dev);
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 8354c1a83312..c7f3b994101c 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -114,9 +114,9 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if (max_buffer_size[dev] < 32)
                max_buffer_size[dev] = 32;
        else if (max_buffer_size[dev] > 1024)
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 5ff4dbb62dad..31542adc6b7e 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1544,9 +1544,9 @@ static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) {
                snd_card_free(card);
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 9bf95367c882..e00614cbceff 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -2409,9 +2409,9 @@ static int __devinit snd_audiopci_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_ensoniq_create(card, pci, &ensoniq)) < 0) {
                snd_card_free(card);
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 4cd9a1faaecc..34a78afc26d0 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1799,9 +1799,9 @@ static int __devinit snd_es1938_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        for (idx = 0; idx < 5; idx++) {
                if (pci_resource_start(pci, idx) == 0 ||
                    !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) {
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index e9c3794bbcb8..dc97e8116141 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2645,9 +2645,9 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (!card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
                
        if (total_bufsize[dev] < 128)
                total_bufsize[dev] = 128;
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index c129f9e2072c..60cdb9e0b68d 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1468,9 +1468,9 @@ static int __devinit snd_card_fm801_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], &chip)) < 0) {
                snd_card_free(card);
                return err;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 5e909e0da04b..3683978324e8 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2059,26 +2059,31 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 {
        const struct snd_pci_quirk *q;
-        /* Check VIA HD Audio Controller exist */
+        switch (fix) {
-        if (chip->pci->vendor == PCI_VENDOR_ID_VIA &&
+        case POS_FIX_LPIB:
-            chip->pci->device == VIA_HDAC_DEVICE_ID) {
+        case POS_FIX_POSBUF:
+                return fix;
+        }
+        /* Check VIA/ATI HD Audio Controller exist */
+        switch (chip->driver_type) {
+        case AZX_DRIVER_VIA:
+        case AZX_DRIVER_ATI:
                chip->via_dmapos_patch = 1;
                /* Use link position directly, avoid any transfer problem. */
                return POS_FIX_LPIB;
        }
        chip->via_dmapos_patch = 0;
-        if (fix == POS_FIX_AUTO) {
+        q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
-                q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
+        if (q) {
-                if (q) {
+                printk(KERN_INFO
-                        printk(KERN_INFO
+                       "hda_intel: position_fix set to %d "
-                                    "hda_intel: position_fix set to %d "
+                       "for device %04x:%04x\n",
-                                    "for device %04x:%04x\n",
+                       q->value, q->subvendor, q->subdevice);
-                                    q->value, q->subvendor, q->subdevice);
+                return q->value;
-                        return q->value;
-                }
        }
-        return fix;
+        return POS_FIX_AUTO;
 }
 /*
@@ -2210,9 +2215,17 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
        gcap = azx_readw(chip, GCAP);
        snd_printdd("chipset global capabilities = 0x%x\n", gcap);
+        /* ATI chips seems buggy about 64bit DMA addresses */
+        if (chip->driver_type == AZX_DRIVER_ATI)
+                gcap &= ~0x01;
        /* allow 64bit DMA address if supported by H/W */
        if ((gcap & 0x01) && !pci_set_dma_mask(pci, DMA_64BIT_MASK))
                pci_set_consistent_dma_mask(pci, DMA_64BIT_MASK);
+        else {
+                pci_set_dma_mask(pci, DMA_32BIT_MASK);
+                pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK);
+        }
        /* read number of streams from GCAP register instead of using
         * hardcoded value
@@ -2334,10 +2347,10 @@ static int __devinit azx_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (!card) {
+        if (err < 0) {
                snd_printk(KERN_ERR SFX "Error creating card!\n");
-                return -ENOMEM;
+                return err;
        }
        err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 3bc427645da8..6094344fb223 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1207,7 +1207,7 @@ static const char *slave_vols[] = {
        "LFE Playback Volume",
        "Side Playback Volume",
        "Headphone Playback Volume",
-        "Headphone Playback Volume",
+        "Headphone2 Playback Volume",
        "Speaker Playback Volume",
        "External Speaker Playback Volume",
        "Speaker2 Playback Volume",
@@ -1221,7 +1221,7 @@ static const char *slave_sws[] = {
        "LFE Playback Switch",
        "Side Playback Switch",
        "Headphone Playback Switch",
-        "Headphone Playback Switch",
+        "Headphone2 Playback Switch",
        "Speaker Playback Switch",
        "External Speaker Playback Switch",
        "Speaker2 Playback Switch",
@@ -3516,6 +3516,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
        if (! spec->autocfg.line_outs)
                return 0; /* can't find valid pin config */
+#if 0 /* FIXME: temporarily disabled */
        /* If we have no real line-out pin and multiple hp-outs, HPs should
         * be set up as multi-channel outputs.
         */
@@ -3535,6 +3536,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
                spec->autocfg.line_out_type = AUTO_PIN_HP_OUT;
                spec->autocfg.hp_outs = 0;
        }
+#endif /* FIXME: temporarily disabled */
        if (spec->autocfg.mono_out_pin) {
                int dir = get_wcaps(codec, spec->autocfg.mono_out_pin) &
                        (AC_WCAP_OUT_AMP | AC_WCAP_IN_AMP);
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 58d7cda03de5..bab1c700f497 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2648,9 +2648,9 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "ICE1712");
        strcpy(card->shortname, "ICEnsemble ICE1712");
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index bb8d8c766b9d..7ff36d3f0f44 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2456,9 +2456,9 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "ICE1724");
        strcpy(card->shortname, "ICEnsemble ICE1724");
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index e900cdc84849..608655e9275e 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -3058,9 +3058,9 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
        int err;
        struct shortname_table *name;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if (spdif_aclink < 0)
                spdif_aclink = check_default_spdif_aclink(pci);
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 93449e464566..33a843c19316 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1269,9 +1269,9 @@ static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
        int err;
        struct shortname_table *name;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "ICH-MODEM");
        strcpy(card->shortname, "Intel ICH");
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 5f8006b42750..8b79969034be 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2443,9 +2443,9 @@ snd_korg1212_probe(struct pci_dev *pci,
                dev++;
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_korg1212_create(card, pci, &korg1212)) < 0) {
                snd_card_free(card);
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 59bbaf8f3e5b..70141548f251 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2691,9 +2691,9 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        switch (pci->device) {
        case PCI_DEVICE_ID_ESS_ALLEGRO:
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index f23a73577c22..c1eb84a14c42 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -607,6 +607,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,
        /* set the format to the board */
        err = mixart_set_format(stream, format);
        if(err < 0) {
+                mutex_unlock(&mgr->setup_mutex);
                return err;
        }
@@ -1365,12 +1366,12 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
                else
                        idx = index[dev] + i;
                snprintf(tmpid, sizeof(tmpid), "%s-%d", id[dev] ? id[dev] : "MIXART", i);
-                card = snd_card_new(idx, tmpid, THIS_MODULE, 0);
+                err = snd_card_create(idx, tmpid, THIS_MODULE, 0, &card);
-                if (! card) {
+                if (err < 0) {
                        snd_printk(KERN_ERR "cannot allocate the card %d\n", i);
                        snd_mixart_free(mgr);
-                        return -ENOMEM;
+                        return err;
                }
                strcpy(card->driver, CARD_NAME);
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 3782b52bc0e8..fa4de985fc4c 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -581,16 +581,6 @@ MODULE_FIRMWARE("mixart/miXart8AES.xlx");
 /* miXart hwdep interface id string */
 #define SND_MIXART_HWDEP_ID       "miXart Loader"
-static int mixart_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-static int mixart_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
 static int mixart_hwdep_dsp_status(struct snd_hwdep *hw,
                                   struct snd_hwdep_dsp_status *info)
 {
@@ -643,8 +633,6 @@ int snd_mixart_setup_firmware(struct mixart_mgr *mgr)
        hw->iface = SNDRV_HWDEP_IFACE_MIXART;
        hw->private_data = mgr;
-        hw->ops.open = mixart_hwdep_open;
-        hw->ops.release = mixart_hwdep_release;
        hw->ops.dsp_status = mixart_hwdep_dsp_status;
        hw->ops.dsp_load = mixart_hwdep_dsp_load;
        hw->exclusive = 1;
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 50c9f8a05082..522a040855d4 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -1668,9 +1668,9 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci,
                }
        }
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        switch (pci->device) {
        case PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO:
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 84f481d41efa..9c81e0b05113 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -459,10 +459,10 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
        struct oxygen *chip;
        int err;
-        card = snd_card_new(index, id, model->owner,
+        err = snd_card_create(index, id, model->owner,
-                            sizeof *chip + model->model_data_size);
+                              sizeof(*chip) + model->model_data_size, &card);
-        if (!card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        chip = card->private_data;
        chip->card = card;
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 27cf2c28d113..7f95459c8b1f 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1510,12 +1510,12 @@ static int __devinit pcxhr_probe(struct pci_dev *pci,
                snprintf(tmpid, sizeof(tmpid), "%s-%d",
                         id[dev] ? id[dev] : card_name, i);
-                card = snd_card_new(idx, tmpid, THIS_MODULE, 0);
+                err = snd_card_create(idx, tmpid, THIS_MODULE, 0, &card);
-                if (! card) {
+                if (err < 0) {
                        snd_printk(KERN_ERR "cannot allocate the card %d\n", i);
                        pcxhr_free(mgr);
-                        return -ENOMEM;
+                        return err;
                }
                strcpy(card->driver, DRIVER_NAME);
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index 592743a298b0..17cb1233a903 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -471,16 +471,6 @@ static int pcxhr_hwdep_dsp_load(struct snd_hwdep *hw,
        return 0;
 }
-static int pcxhr_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-static int pcxhr_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
 int pcxhr_setup_firmware(struct pcxhr_mgr *mgr)
 {
        int err;
@@ -495,8 +485,6 @@ int pcxhr_setup_firmware(struct pcxhr_mgr *mgr)
        hw->iface = SNDRV_HWDEP_IFACE_PCXHR;
        hw->private_data = mgr;
-        hw->ops.open = pcxhr_hwdep_open;
-        hw->ops.release = pcxhr_hwdep_release;
        hw->ops.dsp_status = pcxhr_hwdep_dsp_status;
        hw->ops.dsp_load = pcxhr_hwdep_dsp_load;
        hw->exclusive = 1;
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 3caacfb9d8e0..6f1034417a02 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -2102,9 +2102,9 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_riptide_create(card, pci, &chip)) < 0) {
                snd_card_free(card);
                return err;
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index e7ef3a1a25a8..d7b966e7c4cf 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1941,9 +1941,10 @@ snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                return -ENOENT;
        }
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct rme32))) == NULL)
+                              sizeof(struct rme32), &card);
-                return -ENOMEM;
+        if (err < 0)
+                return err;
        card->private_free = snd_rme32_card_free;
        rme32 = (struct rme32 *) card->private_data;
        rme32->card = card;
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 3fdd488d0975..55fb1c131f58 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -2348,9 +2348,10 @@ snd_rme96_probe(struct pci_dev *pci,
                dev++;
                return -ENOENT;
        }
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct rme96))) == NULL)
+                              sizeof(struct rme96), &card);
-                return -ENOMEM;
+        if (err < 0)
+                return err;
        card->private_free = snd_rme96_card_free;
        rme96 = (struct rme96 *)card->private_data;     
        rme96->card = card;
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 44d0c15e2b71..bacfdd12619b 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -4413,13 +4413,6 @@ static int snd_hdsp_capture_release(struct snd_pcm_substream *substream)
        return 0;
 }
-static int snd_hdsp_hwdep_dummy_op(struct snd_hwdep *hw, struct file *file)
-{
-        /* we have nothing to initialize but the call is required */
-        return 0;
-}
 /* helper functions for copying meter values */
 static inline int copy_u32_le(void __user *dest, void __iomem *src)
 {
@@ -4738,9 +4731,7 @@ static int snd_hdsp_create_hwdep(struct snd_card *card, struct hdsp *hdsp)
        hw->private_data = hdsp;
        strcpy(hw->name, "HDSP hwdep interface");
-        hw->ops.open = snd_hdsp_hwdep_dummy_op;
        hw->ops.ioctl = snd_hdsp_hwdep_ioctl;
-        hw->ops.release = snd_hdsp_hwdep_dummy_op;
                
        return 0;
 }
@@ -5158,8 +5149,10 @@ static int __devinit snd_hdsp_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        if (!(card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct hdsp))))
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                return -ENOMEM;
+                              sizeof(struct hdsp), &card);
+        if (err < 0)
+                return err;
        hdsp = (struct hdsp *) card->private_data;
        card->private_free = snd_hdsp_card_free;
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 71231cf1b2b0..bac2dc0c5d85 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -4100,13 +4100,6 @@ static int snd_hdspm_capture_release(struct snd_pcm_substream *substream)
        return 0;
 }
-static int snd_hdspm_hwdep_dummy_op(struct snd_hwdep * hw, struct file *file)
-{
-        /* we have nothing to initialize but the call is required */
-        return 0;
-}
 static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
                                 unsigned int cmd, unsigned long arg)
 {
@@ -4213,9 +4206,7 @@ static int __devinit snd_hdspm_create_hwdep(struct snd_card *card,
        hw->private_data = hdspm;
        strcpy(hw->name, "HDSPM hwdep interface");
-        hw->ops.open = snd_hdspm_hwdep_dummy_op;
        hw->ops.ioctl = snd_hdspm_hwdep_ioctl;
-        hw->ops.release = snd_hdspm_hwdep_dummy_op;
        return 0;
 }
@@ -4503,10 +4494,10 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev],
+        err = snd_card_create(index[dev], id[dev],
-                            THIS_MODULE, sizeof(struct hdspm));
+                              THIS_MODULE, sizeof(struct hdspm), &card);
-        if (!card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        hdspm = card->private_data;
        card->private_free = snd_hdspm_card_free;
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 2570907134d7..bc539abb2105 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -2594,11 +2594,11 @@ static int __devinit snd_rme9652_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_rme9652));
+                              sizeof(struct snd_rme9652), &card);
-        if (!card)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        rme9652 = (struct snd_rme9652 *) card->private_data;
        card->private_free = snd_rme9652_card_free;
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index df2007e3be7c..baf6d8e3dabc 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -1387,9 +1387,8 @@ static int __devinit snd_sis7019_probe(struct pci_dev *pci,
        if (!enable)
                goto error_out;
-        rc = -ENOMEM;
+        rc = snd_card_create(index, id, THIS_MODULE, sizeof(*sis), &card);
-        card = snd_card_new(index, id, THIS_MODULE, sizeof(*sis));
+        if (rc < 0)
-        if (!card)
                goto error_out;
        strcpy(card->driver, "SiS7019");
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index cd408b86c839..c5601b0ad7cc 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1423,9 +1423,9 @@ static int __devinit snd_sonic_probe(struct pci_dev *pci,
                return -ENOENT;
        }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        for (idx = 0; idx < 5; idx++) {
                if (pci_resource_start(pci, idx) == 0 ||
                    !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) {
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index d94b16ffb385..21cef97d478d 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -89,9 +89,9 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_trident_create(card, pci,
                                      pcm_channels[dev],
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 1aafe956ee2b..d8705547dae1 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2433,9 +2433,9 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
        unsigned int i;
        int err;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        card_type = pci_id->driver_data;
        switch (card_type) {
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 5bd79d2a5a15..c086b762c150 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -1167,9 +1167,9 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
        unsigned int i;
        int err;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        card_type = pci_id->driver_data;
        switch (card_type) {
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index acc352f4a441..fc9136c3e0d7 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -204,9 +204,9 @@ static int __devinit snd_vx222_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        switch ((int)pci_id->driver_data) {
        case VX_PCI_VX222_OLD:
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 2631a554845e..4af66661f9b0 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -187,9 +187,9 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        switch (pci_id->device) {
        case 0x0004: str = "YMF724";  model = "DS-1"; break;
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 819aaaac432f..7dea74b71cf1 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -91,7 +91,7 @@ static int snd_pdacf_dev_free(struct snd_device *device)
 */
 static int snd_pdacf_probe(struct pcmcia_device *link)
 {
-        int i;
+        int i, err;
        struct snd_pdacf *pdacf;
        struct snd_card *card;
        static struct snd_device_ops ops = {
@@ -112,20 +112,23 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
                return -ENODEV; /* disabled explicitly */
        /* ok, create a card instance */
-        card = snd_card_new(index[i], id[i], THIS_MODULE, 0);
+        err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card);
-        if (card == NULL) {
+        if (err < 0) {
                snd_printk(KERN_ERR "pdacf: cannot create a card instance\n");
-                return -ENOMEM;
+                return err;
        }
        pdacf = snd_pdacf_create(card);
-        if (! pdacf)
+        if (!pdacf) {
-                return -EIO;
+                snd_card_free(card);
+                return -ENOMEM;
+        }
-        if (snd_device_new(card, SNDRV_DEV_LOWLEVEL, pdacf, &ops) < 0) {
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, pdacf, &ops);
+        if (err < 0) {
                kfree(pdacf);
                snd_card_free(card);
-                return -ENODEV;
+                return err;
        }
        snd_card_set_dev(card, &handle_to_dev(link));
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 706602a40600..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,
+static int snd_vxpocket_new(struct snd_card *card, int ibl,
-                                             struct pcmcia_device *link)
+                            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)
+        if (!chip)
-                return NULL;
+                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;
 }
@@ -292,7 +296,7 @@ static int vxpocket_probe(struct pcmcia_device *p_dev)
 {
        struct snd_card *card;
        struct snd_vxpocket *vxp;
-        int i;
+        int i, err;
        /* find an empty slot from the card list */
        for (i = 0; i < SNDRV_CARDS; i++) {
@@ -307,16 +311,16 @@ static int vxpocket_probe(struct pcmcia_device *p_dev)
                return -ENODEV; /* disabled explicitly */
        /* ok, create a card instance */
-        card = snd_card_new(index[i], id[i], THIS_MODULE, 0);
+        err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card);
-        if (card == NULL) {
+        if (err < 0) {
                snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n");
-                return -ENOMEM;
+                return err;
        }
-        vxp = snd_vxpocket_new(card, ibl[i], p_dev);
+        err = snd_vxpocket_new(card, ibl[i], p_dev, &vxp);
-        if (! vxp) {
+        if (err < 0) {
                snd_card_free(card);
-                return -ENODEV;
+                return err;
        }
        card->private_data = vxp;
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index c936225771ba..2e18ed0ea899 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -58,9 +58,9 @@ static int __init snd_pmac_probe(struct platform_device *devptr)
        char *name_ext;
        int err;
-        card = snd_card_new(index, id, THIS_MODULE, 0);
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        if ((err = snd_pmac_new(card, &chip)) < 0)
                goto __error;
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index ff321110ec02..f361c26506aa 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -969,11 +969,9 @@ static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
        }
        /* create card instance */
-        the_card.card = snd_card_new(index, id, THIS_MODULE, 0);
+        ret = snd_card_create(index, id, THIS_MODULE, 0, &the_card.card);
-        if (!the_card.card) {
+        if (ret < 0)
-                ret = -ENXIO;
                goto clean_irq;
-        }
        strcpy(the_card.card->driver, "PS3");
        strcpy(the_card.card->shortname, "PS3");
diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index 7c920f3e7fe3..f551233c5a08 100644
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -609,11 +609,11 @@ static int __devinit snd_aica_probe(struct platform_device *devptr)
        dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL);
        if (unlikely(!dreamcastcard))
                return -ENOMEM;
-        dreamcastcard->card =
+        err = snd_card_create(index, SND_AICA_DRIVER, THIS_MODULE, 0,
-            snd_card_new(index, SND_AICA_DRIVER, THIS_MODULE, 0);
+                              &dreamcastcard->card);
-        if (unlikely(!dreamcastcard->card)) {
+        if (unlikely(err < 0)) {
                kfree(dreamcastcard);
-                return -ENODEV;
+                return err;
        }
        strcpy(dreamcastcard->card->driver, "snd_aica");
        strcpy(dreamcastcard->card->shortname, SND_AICA_DRIVER);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ec3f8bb4b51d..637f0d1ea98e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1311,17 +1311,17 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
 {
        struct snd_soc_codec *codec = socdev->codec;
        struct snd_soc_card *card = socdev->card;
-        int ret = 0, i;
+        int ret, i;
        mutex_lock(&codec->mutex);
        /* register a sound card */
-        codec->card = snd_card_new(idx, xid, codec->owner, 0);
+        ret = snd_card_create(idx, xid, codec->owner, 0, &codec->card);
-        if (!codec->card) {
+        if (ret < 0) {
                printk(KERN_ERR "asoc: can't create sound card for codec %s\n",
                        codec->name);
                mutex_unlock(&codec->mutex);
-                return -ENODEV;
+                return ret;
        }
        codec->card->dev = socdev->dev;
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index f87933e48812..ba38912614b4 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1018,9 +1018,10 @@ static int __devinit amd7930_sbus_probe(struct of_device *op, const struct of_de
                return -ENOENT;
        }
-        card = snd_card_new(index[dev_num], id[dev_num], THIS_MODULE, 0);
+        err = snd_card_create(index[dev_num], id[dev_num], THIS_MODULE, 0,
-        if (card == NULL)
+                              &card);
-                return -ENOMEM;
+        if (err < 0)
+                return err;
        strcpy(card->driver, "AMD7930");
        strcpy(card->shortname, "Sun AMD7930");
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 41c387587474..7d93fa705ccf 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1563,6 +1563,7 @@ static int __init cs4231_attach_begin(struct snd_card **rcard)
 {
        struct snd_card *card;
        struct snd_cs4231 *chip;
+        int err;
        *rcard = NULL;
@@ -1574,10 +1575,10 @@ static int __init cs4231_attach_begin(struct snd_card **rcard)
                return -ENOENT;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_cs4231));
+                              sizeof(struct snd_cs4231), &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "CS4231");
        strcpy(card->shortname, "Sun CS4231");
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 23ed6f04a718..af95ff1e126c 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2612,10 +2612,10 @@ static int __devinit dbri_probe(struct of_device *op, const struct of_device_id
                return -ENODEV;
        }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_dbri));
+                              sizeof(struct snd_dbri), &card);
-        if (card == NULL)
+        if (err < 0)
-                return -ENOMEM;
+                return err;
        strcpy(card->driver, "DBRI");
        strcpy(card->shortname, "Sun DBRI");
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index 09802e8a6fb8..4c7b051f9d17 100644
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -965,12 +965,11 @@ static int __devinit snd_at73c213_probe(struct spi_device *spi)
                return PTR_ERR(board->dac_clk);
        }
-        retval = -ENOMEM;
        /* Allocate "card" using some unused identifiers. */
        snprintf(id, sizeof id, "at73c213_%d", board->ssc_id);
-        card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct snd_at73c213));
+        retval = snd_card_create(-1, id, THIS_MODULE,
-        if (!card)
+                                 sizeof(struct snd_at73c213), &card);
+        if (retval < 0)
                goto out;
        chip = card->private_data;
diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c
index 0a5391436add..ff0b2a8fd25b 100644
--- a/sound/synth/emux/emux_hwdep.c
+++ b/sound/synth/emux/emux_hwdep.c
@@ -24,25 +24,6 @@
 #include <asm/uaccess.h>
 #include "emux_voice.h"
-/*
- * open the hwdep device
- */
-static int
-snd_emux_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-/*
- * close the device
- */
-static int
-snd_emux_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
 #define TMP_CLIENT_ID   0x1001
@@ -146,8 +127,6 @@ snd_emux_init_hwdep(struct snd_emux *emu)
        emu->hwdep = hw;
        strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME);
        hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE;
-        hw->ops.open = snd_emux_hwdep_open;
-        hw->ops.release = snd_emux_hwdep_release;
        hw->ops.ioctl = snd_emux_hwdep_ioctl;
        hw->exclusive = 1;
        hw->private_data = emu;
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index 41c36b055f6b..09aed2363cc9 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -336,9 +336,10 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
                log("Unable to set up control system (ret=%d)\n", ret);
 }
-static struct snd_card* create_card(struct usb_device* usb_dev)
+static int create_card(struct usb_device* usb_dev, struct snd_card **cardp)
 {
        int devnum;
+        int err;
        struct snd_card *card;
        struct snd_usb_caiaqdev *dev;
@@ -347,12 +348,12 @@ static struct snd_card* create_card(struct usb_device* usb_dev)
                        break;
        if (devnum >= SNDRV_CARDS)
-                return NULL;
+                return -ENODEV;
-        card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, 
+        err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, 
-                                        sizeof(struct snd_usb_caiaqdev));
+                              sizeof(struct snd_usb_caiaqdev), &card);
-        if (!card)
+        if (err < 0)
-                return NULL;
+                return err;
        dev = caiaqdev(card);
        dev->chip.dev = usb_dev;
@@ -362,7 +363,8 @@ static struct snd_card* create_card(struct usb_device* usb_dev)
        spin_lock_init(&dev->spinlock);
        snd_card_set_dev(card, &usb_dev->dev);
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int __devinit init_card(struct snd_usb_caiaqdev *dev)
@@ -441,10 +443,10 @@ static int __devinit snd_probe(struct usb_interface *intf,
        struct snd_card *card;
        struct usb_device *device = interface_to_usbdev(intf);
        
-        card = create_card(device);
+        ret = create_card(device, &card);
        
-        if (!card)
+        if (ret < 0)
-                return -ENOMEM;
+                return ret;
                        
        usb_set_intfdata(intf, card);
        ret = init_card(caiaqdev(card));
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 19e37451c216..8f3cdb37a0ec 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3466,10 +3466,10 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
                return -ENXIO;
        }
-        card = snd_card_new(index[idx], id[idx], THIS_MODULE, 0);
+        err = snd_card_create(index[idx], id[idx], THIS_MODULE, 0, &card);
-        if (card == NULL) {
+        if (err < 0) {
                snd_printk(KERN_ERR "cannot create card instance %d\n", idx);
-                return -ENOMEM;
+                return err;
        }
        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 00397c8a765b..2bde79216fa5 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -78,7 +78,6 @@ struct usb_mixer_interface {
        /* Sound Blaster remote control stuff */
        const struct rc_config *rc_cfg;
-        unsigned long rc_hwdep_open;
        u32 rc_code;
        wait_queue_head_t rc_waitq;
        struct urb *rc_urb;
@@ -1797,24 +1796,6 @@ static void snd_usb_soundblaster_remote_complete(struct urb *urb)
        wake_up(&mixer->rc_waitq);
 }
-static int snd_usb_sbrc_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        struct usb_mixer_interface *mixer = hw->private_data;
-        if (test_and_set_bit(0, &mixer->rc_hwdep_open))
-                return -EBUSY;
-        return 0;
-}
-static int snd_usb_sbrc_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        struct usb_mixer_interface *mixer = hw->private_data;
-        clear_bit(0, &mixer->rc_hwdep_open);
-        smp_mb__after_clear_bit();
-        return 0;
-}
 static long snd_usb_sbrc_hwdep_read(struct snd_hwdep *hw, char __user *buf,
                                     long count, loff_t *offset)
 {
@@ -1867,9 +1848,8 @@ static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
        hwdep->iface = SNDRV_HWDEP_IFACE_SB_RC;
        hwdep->private_data = mixer;
        hwdep->ops.read = snd_usb_sbrc_hwdep_read;
-        hwdep->ops.open = snd_usb_sbrc_hwdep_open;
-        hwdep->ops.release = snd_usb_sbrc_hwdep_release;
        hwdep->ops.poll = snd_usb_sbrc_hwdep_poll;
+        hwdep->exclusive = 1;
        mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!mixer->rc_urb)
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index 73e59f4403a4..98276aafefe6 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -478,19 +478,21 @@ static bool us122l_create_card(struct snd_card *card)
        return true;
 }
-static struct snd_card *usx2y_create_card(struct usb_device *device)
+static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp)
 {
        int             dev;
        struct snd_card *card;
+        int err;
        for (dev = 0; dev < SNDRV_CARDS; ++dev)
                if (enable[dev] && !snd_us122l_card_used[dev])
                        break;
        if (dev >= SNDRV_CARDS)
-                return NULL;
+                return -ENODEV;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct us122l));
+                              sizeof(struct us122l), &card);
-        if (!card)
+        if (err < 0)
-                return NULL;
+                return err;
        snd_us122l_card_used[US122L(card)->chip.index = dev] = 1;
        US122L(card)->chip.dev = device;
@@ -509,46 +511,57 @@ static struct snd_card *usx2y_create_card(struct usb_device *device)
                US122L(card)->chip.dev->devnum
                );
        snd_card_set_dev(card, &device->dev);
-        return card;
+        *cardp = card;
+        return 0;
 }
-static void *us122l_usb_probe(struct usb_interface *intf,
+static int us122l_usb_probe(struct usb_interface *intf,
-                              const struct usb_device_id *device_id)
+                            const struct usb_device_id *device_id,
+                            struct snd_card **cardp)
 {
        struct usb_device *device = interface_to_usbdev(intf);
-        struct snd_card *card = usx2y_create_card(device);
+        struct snd_card *card;
+        int err;
-        if (!card)
+        err = usx2y_create_card(device, &card);
-                return NULL;
+        if (err < 0)
+                return err;
-        if (!us122l_create_card(card) ||
+        if (!us122l_create_card(card)) {
-            snd_card_register(card) < 0) {
                snd_card_free(card);
-                return NULL;
+                return -EINVAL;
+        }
+        err = snd_card_register(card);
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
        }
        usb_get_dev(device);
-        return card;
+        *cardp = card;
+        return 0;
 }
 static int snd_us122l_probe(struct usb_interface *intf,
                            const struct usb_device_id *id)
 {
        struct snd_card *card;
+        int err;
        snd_printdd(KERN_DEBUG"%p:%i\n",
                    intf, intf->cur_altsetting->desc.bInterfaceNumber);
        if (intf->cur_altsetting->desc.bInterfaceNumber != 1)
                return 0;
-        card = us122l_usb_probe(usb_get_intf(intf), id);
+        err = us122l_usb_probe(usb_get_intf(intf), id, &card);
+        if (err < 0) {
-        if (card) {
+                usb_put_intf(intf);
-                usb_set_intfdata(intf, card);
+                return err;
-                return 0;
        }
-        usb_put_intf(intf);
+        usb_set_intfdata(intf, card);
-        return -EIO;
+        return 0;
 }
 static void snd_us122l_disconnect(struct usb_interface *intf)
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index 1558a5c4094f..a26d8d83d3eb 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -106,16 +106,6 @@ static unsigned int snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file,
 }
-static int snd_usX2Y_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-static int snd_usX2Y_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
 static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
                                      struct snd_hwdep_dsp_status *info)
 {
@@ -267,8 +257,6 @@ int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device)
        hw->iface = SNDRV_HWDEP_IFACE_USX2Y;
        hw->private_data = usX2Y(card);
-        hw->ops.open = snd_usX2Y_hwdep_open;
-        hw->ops.release = snd_usX2Y_hwdep_release;
        hw->ops.dsp_status = snd_usX2Y_hwdep_dsp_status;
        hw->ops.dsp_load = snd_usX2Y_hwdep_dsp_load;
        hw->ops.mmap = snd_us428ctls_mmap;
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 11639bd72a51..af8b84954054 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -333,18 +333,21 @@ static struct usb_device_id snd_usX2Y_usb_id_table[] = {
        { /* terminator */ }
 };
-static struct snd_card *usX2Y_create_card(struct usb_device *device)
+static int usX2Y_create_card(struct usb_device *device, struct snd_card **cardp)
 {
        int             dev;
        struct snd_card *       card;
+        int err;
        for (dev = 0; dev < SNDRV_CARDS; ++dev)
                if (enable[dev] && !snd_usX2Y_card_used[dev])
                        break;
        if (dev >= SNDRV_CARDS)
-                return NULL;
+                return -ENODEV;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct usX2Ydev));
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-        if (!card)
+                              sizeof(struct usX2Ydev), &card);
-                return NULL;
+        if (err < 0)
+                return err;
        snd_usX2Y_card_used[usX2Y(card)->chip.index = dev] = 1;
        card->private_free = snd_usX2Y_card_private_free;
        usX2Y(card)->chip.dev = device;
@@ -362,26 +365,36 @@ static struct snd_card *usX2Y_create_card(struct usb_device *device)
                usX2Y(card)->chip.dev->bus->busnum, usX2Y(card)->chip.dev->devnum
                );
        snd_card_set_dev(card, &device->dev);
-        return card;
+        *cardp = card;
+        return 0;
 }
-static void *usX2Y_usb_probe(struct usb_device *device, struct usb_interface *intf, const struct usb_device_id *device_id)
+static int usX2Y_usb_probe(struct usb_device *device,
+                           struct usb_interface *intf,
+                           const struct usb_device_id *device_id,
+                           struct snd_card **cardp)
 {
        int             err;
        struct snd_card *       card;
+        *cardp = NULL;
        if (le16_to_cpu(device->descriptor.idVendor) != 0x1604 ||
            (le16_to_cpu(device->descriptor.idProduct) != USB_ID_US122 &&
             le16_to_cpu(device->descriptor.idProduct) != USB_ID_US224 &&
-             le16_to_cpu(device->descriptor.idProduct) != USB_ID_US428) ||
+             le16_to_cpu(device->descriptor.idProduct) != USB_ID_US428))
-            !(card = usX2Y_create_card(device)))
+                return -EINVAL;
-                return NULL;
+        err = usX2Y_create_card(device, &card);
+        if (err < 0)
+                return err;
        if ((err = usX2Y_hwdep_new(card, device)) < 0  ||
            (err = snd_card_register(card)) < 0) {
                snd_card_free(card);
-                return NULL;
+                return err;
        }
-        return card;
+        *cardp = card;
+        return 0;
 }
 /*
@@ -389,13 +402,14 @@ static void *usX2Y_usb_probe(struct usb_device *device, struct usb_interface *in
 */
 static int snd_usX2Y_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
-        void *chip;
+        struct snd_card *card;
-        chip = usX2Y_usb_probe(interface_to_usbdev(intf), intf, id);
+        int err;
-        if (chip) {
-                usb_set_intfdata(intf, chip);
+        err = usX2Y_usb_probe(interface_to_usbdev(intf), intf, id, &card);
-                return 0;
+        if (err < 0)
-        } else
+                return err;
-                return -EIO;
+        dev_set_drvdata(&intf->dev, card);
+        return 0;
 }
 static void snd_usX2Y_disconnect(struct usb_interface *intf)