diff options
-rw-r--r-- | sound/sh/aica.c | 5 | ||||
-rw-r--r-- | sound/sh/sh_dac_audio.c | 2 |
2 files changed, 3 insertions, 4 deletions
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) | |||
608 | dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL); | 608 | dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL); |
609 | if (unlikely(!dreamcastcard)) | 609 | if (unlikely(!dreamcastcard)) |
610 | return -ENOMEM; | 610 | return -ENOMEM; |
611 | err = snd_card_create(index, SND_AICA_DRIVER, THIS_MODULE, 0, | 611 | err = snd_card_new(&devptr->dev, index, SND_AICA_DRIVER, |
612 | &dreamcastcard->card); | 612 | THIS_MODULE, 0, &dreamcastcard->card); |
613 | if (unlikely(err < 0)) { | 613 | if (unlikely(err < 0)) { |
614 | kfree(dreamcastcard); | 614 | kfree(dreamcastcard); |
615 | return err; | 615 | return err; |
@@ -624,7 +624,6 @@ static int snd_aica_probe(struct platform_device *devptr) | |||
624 | err = snd_aicapcmchip(dreamcastcard, 0); | 624 | err = snd_aicapcmchip(dreamcastcard, 0); |
625 | if (unlikely(err < 0)) | 625 | if (unlikely(err < 0)) |
626 | goto freedreamcast; | 626 | goto freedreamcast; |
627 | snd_card_set_dev(dreamcastcard->card, &devptr->dev); | ||
628 | dreamcastcard->timer.data = 0; | 627 | dreamcastcard->timer.data = 0; |
629 | dreamcastcard->channel = NULL; | 628 | dreamcastcard->channel = NULL; |
630 | /* Add basic controls */ | 629 | /* Add basic controls */ |
diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c index 7c9422c4fc0f..d1fb74dabbd1 100644 --- a/sound/sh/sh_dac_audio.c +++ b/sound/sh/sh_dac_audio.c | |||
@@ -396,7 +396,7 @@ static int snd_sh_dac_probe(struct platform_device *devptr) | |||
396 | struct snd_card *card; | 396 | struct snd_card *card; |
397 | int err; | 397 | int err; |
398 | 398 | ||
399 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); | 399 | err = snd_card_new(&devptr->dev, index, id, THIS_MODULE, 0, &card); |
400 | if (err < 0) { | 400 | if (err < 0) { |
401 | snd_printk(KERN_ERR "cannot allocate the card\n"); | 401 | snd_printk(KERN_ERR "cannot allocate the card\n"); |
402 | return err; | 402 | return err; |