Merge tag 'driver-core-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / sound / drivers / mtpav.c

diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index e5ec7eb27dec5f873c36b6c6f5e3e79a44fdddfe..4b66c7f22af797332059e2a1ef57ae7c0e6a9f06 100644 (file)
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -697,7 +697,8 @@ static int snd_mtpav_probe(struct platform_device *dev)
        int err;
        struct mtpav *mtp_card;
 
-       err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &card);
+       err = snd_card_new(&dev->dev, index, id, THIS_MODULE,
+                          sizeof(*mtp_card), &card);
        if (err < 0)
                return err;
 
@@ -732,7 +733,6 @@ static int snd_mtpav_probe(struct platform_device *dev)
 
        snd_mtpav_portscan(mtp_card);
 
-       snd_card_set_dev(card, &dev->dev);
        err = snd_card_register(mtp_card->card);
        if (err < 0)
                goto __error;