|
@@ -608,8 +608,8 @@ static int snd_aica_probe(struct platform_device *devptr)
|
|
dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL);
|
|
dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL);
|
|
if (unlikely(!dreamcastcard))
|
|
if (unlikely(!dreamcastcard))
|
|
return -ENOMEM;
|
|
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)) {
|
|
if (unlikely(err < 0)) {
|
|
kfree(dreamcastcard);
|
|
kfree(dreamcastcard);
|
|
return err;
|
|
return err;
|
|
@@ -624,7 +624,6 @@ static int snd_aica_probe(struct platform_device *devptr)
|
|
err = snd_aicapcmchip(dreamcastcard, 0);
|
|
err = snd_aicapcmchip(dreamcastcard, 0);
|
|
if (unlikely(err < 0))
|
|
if (unlikely(err < 0))
|
|
goto freedreamcast;
|
|
goto freedreamcast;
|
|
- snd_card_set_dev(dreamcastcard->card, &devptr->dev);
|
|
|
|
dreamcastcard->timer.data = 0;
|
|
dreamcastcard->timer.data = 0;
|
|
dreamcastcard->channel = NULL;
|
|
dreamcastcard->channel = NULL;
|
|
/* Add basic controls */
|
|
/* Add basic controls */
|