diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 10:22:14 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 10:22:14 +0100 |
commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/mips/au1x00.c | |
parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
download | linux-next-a5e0e970c06065a14844b406a0c2a59776a1ccc6.tar.gz |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/mips/au1x00.c')
-rw-r--r-- | sound/mips/au1x00.c | 7 |
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; |