summaryrefslogtreecommitdiff
path: root/sound/mips/au1x00.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-05 15:08:33 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-05 15:08:33 +0100
commit6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 (patch)
tree2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179 /sound/mips/au1x00.c
parent18e352e4a73465349711a9324767e1b2453383e2 (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
Merge branch 'topic/snd_card_new-err' into topic/atmel
Diffstat (limited to 'sound/mips/au1x00.c')
-rw-r--r--sound/mips/au1x00.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index 1881cec11e78..99e1391b2eb4 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;