Merge branch 'topic/rawmidi-fix' into for-linus

[linux-2.6-omap-h63xx.git] / sound / pci / ice1712 / ice1724.c

diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 0dfa0540ce2cb917991d058d8c6aa9d88e6329ba..7ff36d3f0f44f9078da5f08e8be89e8a32b0a485 100644 (file)
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -1239,7 +1239,7 @@ static int __devinit snd_vt1724_pcm_spdif(struct snd_ice1712 *ice, int device)
        if (ice->force_pdma4 || ice->force_rdma1)
                name = "ICE1724 Secondary";
        else
-               name = "IEC1724 IEC958";
+               name = "ICE1724 IEC958";
        err = snd_pcm_new(ice->card, name, device, play, capt, &pcm);
        if (err < 0)
                return err;
@@ -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);
-       if (card == NULL)
-               return -ENOMEM;
+       err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+       if (err < 0)
+               return err;
 
        strcpy(card->driver, "ICE1724");
        strcpy(card->shortname, "ICEnsemble ICE1724");