diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-16 23:03:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-16 23:03:57 +0100 |
| commit | 96cf45cf559be375de29dd45afc50fa8946fb2aa (patch) | |
| tree | 06242d4256aadc01aee67dfafbb94541e7a17738 /sound/sparc/cs4231.c | |
| parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/sparc/cs4231.c')
| -rw-r--r-- | sound/sparc/cs4231.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 41c38758747..7d93fa705cc 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -1563,6 +1563,7 @@ static int __init cs4231_attach_begin(struct snd_card **rcard) { struct snd_card *card; struct snd_cs4231 *chip; + int err; *rcard = NULL; @@ -1574,10 +1575,10 @@ static int __init cs4231_attach_begin(struct snd_card **rcard) return -ENOENT; } - card = snd_card_new(index[dev], id[dev], THIS_MODULE, - sizeof(struct snd_cs4231)); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, + sizeof(struct snd_cs4231), &card); + if (err < 0) + return err; strcpy(card->driver, "CS4231"); strcpy(card->shortname, "Sun CS4231"); |