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

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

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 1a05b2d64c9b3b278175654c643c2a7bbb5ed00d..9284829bf9275e9c2afabbbe8e2026c35c2dfb60 100644 (file)
--- 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);
-       if (card == NULL) {
+       err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+       if (err < 0) {
                snd_printd("Cannot create card\n");
-               return -ENOMEM;
+               return err;
        }
        strcpy(card->driver, DRIVER_NAME);
        strcpy(card->shortname, "ESI " CARD_NAME);