diff options
| author | Takashi Iwai <tiwai@alsa3.local> | 2008-12-28 16:45:02 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-12 15:21:19 +0100 |
| commit | bd7dd77c2a05c530684eea2e3af16449ae9c5d52 (patch) | |
| tree | f26e8b6c83ed58d3c2d47f9df6373812db80a885 /sound/mips | |
| parent | e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 (diff) | |
| download | op-kernel-dev-bd7dd77c2a05c530684eea2e3af16449ae9c5d52.zip op-kernel-dev-bd7dd77c2a05c530684eea2e3af16449ae9c5d52.tar.gz | |
ALSA: Convert to snd_card_create() in other sound/*
Convert from snd_card_new() to the new snd_card_create() function
in other sound subdirectories.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/mips')
| -rw-r--r-- | sound/mips/au1x00.c | 7 | ||||
| -rw-r--r-- | sound/mips/hal2.c | 6 | ||||
| -rw-r--r-- | sound/mips/sgio2audio.c | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index 1881cec..99e1391b 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c @@ -636,9 +636,10 @@ au1000_init(void) struct snd_card *card; struct snd_au1000 *au1000; - card = snd_card_new(-1, "AC97", THIS_MODULE, sizeof(struct snd_au1000)); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(-1, "AC97", THIS_MODULE, + sizeof(struct snd_au1000), &card); + if (err < 0) + return err; card->private_free = snd_au1000_free; au1000 = card->private_data; diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index db495be..c52691c 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -878,9 +878,9 @@ static int __devinit hal2_probe(struct platform_device *pdev) struct snd_hal2 *chip; int err; - card = snd_card_new(index, id, THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index, id, THIS_MODULE, 0, &card); + if (err < 0) + return err; err = hal2_create(card, &chip); if (err < 0) { diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 4c63504..66f3b48 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) struct snd_sgio2audio *chip; int err; - card = snd_card_new(index, id, THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index, id, THIS_MODULE, 0, &card); + if (err < 0) + return err; err = snd_sgio2audio_create(card, &chip); if (err < 0) { |
