X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=sound%2Fsh%2Faica.c;h=47849eaf266d5c1e2ba17ddd50edf4dda6381d92;hb=59ecc26004e77e100c700b1d0da7502b0fdadb46;hp=78a369785a9ecf3b3e8d1a72e6b536e6a8ddb89a;hpb=560ae37178b12e3bd37626f7b1e0b29c503ea558;p=karo-tx-linux.git diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 78a369785a9e..47849eaf266d 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -608,8 +608,8 @@ static int snd_aica_probe(struct platform_device *devptr) dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL); if (unlikely(!dreamcastcard)) return -ENOMEM; - err = snd_card_create(index, SND_AICA_DRIVER, THIS_MODULE, 0, - &dreamcastcard->card); + err = snd_card_new(&devptr->dev, index, SND_AICA_DRIVER, + THIS_MODULE, 0, &dreamcastcard->card); if (unlikely(err < 0)) { kfree(dreamcastcard); return err; @@ -624,7 +624,6 @@ static int snd_aica_probe(struct platform_device *devptr) err = snd_aicapcmchip(dreamcastcard, 0); if (unlikely(err < 0)) goto freedreamcast; - snd_card_set_dev(dreamcastcard->card, &devptr->dev); dreamcastcard->timer.data = 0; dreamcastcard->channel = NULL; /* Add basic controls */