diff options
Diffstat (limited to 'sound/mips')
-rw-r--r-- | sound/mips/au1x00.c | 9 | ||||
-rw-r--r-- | sound/mips/hal2.c | 6 | ||||
-rw-r--r-- | sound/mips/sgio2audio.c | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index 1881cec11e78..3e763d6a5d67 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c | |||
@@ -636,9 +636,10 @@ au1000_init(void) | |||
636 | struct snd_card *card; | 636 | struct snd_card *card; |
637 | struct snd_au1000 *au1000; | 637 | struct snd_au1000 *au1000; |
638 | 638 | ||
639 | card = snd_card_new(-1, "AC97", THIS_MODULE, sizeof(struct snd_au1000)); | 639 | err = snd_card_create(-1, "AC97", THIS_MODULE, |
640 | if (card == NULL) | 640 | sizeof(struct snd_au1000), &card); |
641 | return -ENOMEM; | 641 | if (err < 0) |
642 | return err; | ||
642 | 643 | ||
643 | card->private_free = snd_au1000_free; | 644 | card->private_free = snd_au1000_free; |
644 | au1000 = card->private_data; | 645 | au1000 = card->private_data; |
@@ -678,7 +679,7 @@ au1000_init(void) | |||
678 | return err; | 679 | return err; |
679 | } | 680 | } |
680 | 681 | ||
681 | printk( KERN_INFO "ALSA AC97: Driver Initialized\n" ); | 682 | printk(KERN_INFO "ALSA AC97: Driver Initialized\n"); |
682 | au1000_card = card; | 683 | au1000_card = card; |
683 | return 0; | 684 | return 0; |
684 | } | 685 | } |
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index db495be01861..c52691c2fc46 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c | |||
@@ -878,9 +878,9 @@ static int __devinit hal2_probe(struct platform_device *pdev) | |||
878 | struct snd_hal2 *chip; | 878 | struct snd_hal2 *chip; |
879 | int err; | 879 | int err; |
880 | 880 | ||
881 | card = snd_card_new(index, id, THIS_MODULE, 0); | 881 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
882 | if (card == NULL) | 882 | if (err < 0) |
883 | return -ENOMEM; | 883 | return err; |
884 | 884 | ||
885 | err = hal2_create(card, &chip); | 885 | err = hal2_create(card, &chip); |
886 | if (err < 0) { | 886 | if (err < 0) { |
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 4c63504348dc..66f3b48ceafc 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c | |||
@@ -936,9 +936,9 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev) | |||
936 | struct snd_sgio2audio *chip; | 936 | struct snd_sgio2audio *chip; |
937 | int err; | 937 | int err; |
938 | 938 | ||
939 | card = snd_card_new(index, id, THIS_MODULE, 0); | 939 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
940 | if (card == NULL) | 940 | if (err < 0) |
941 | return -ENOMEM; | 941 | return err; |
942 | 942 | ||
943 | err = snd_sgio2audio_create(card, &chip); | 943 | err = snd_sgio2audio_create(card, &chip); |
944 | if (err < 0) { | 944 | if (err < 0) { |