Merge branch 'topic/snd_card_new-err' into topic/drop-l3

[linux-2.6-omap-h63xx.git] / sound / drivers / virmidi.c

diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index 1022e365606ff6c5607017c3b467cac0168aba83..0e631c3221e3b72f46b2b1b11569d5931ead1097 100644 (file)
--- 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,
-                           sizeof(struct snd_card_virmidi));
-       if (card == NULL)
-               return -ENOMEM;
+       err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                             sizeof(struct snd_card_virmidi), &card);
+       if (err < 0)
+               return err;
        vmidi = (struct snd_card_virmidi *)card->private_data;
        vmidi->card = card;