diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 17:57:37 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 17:57:37 +0100 |
commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/aoa/core/alsa.c | |
parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
download | linux-dbe36c9dd571e035078207862766963c4fc80262.tar.gz linux-dbe36c9dd571e035078207862766963c4fc80262.tar.bz2 linux-dbe36c9dd571e035078207862766963c4fc80262.zip |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Diffstat (limited to 'sound/aoa/core/alsa.c')
-rw-r--r-- | sound/aoa/core/alsa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c index 617850463582..0fa3855b4790 100644 --- a/sound/aoa/core/alsa.c +++ b/sound/aoa/core/alsa.c @@ -23,9 +23,10 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev) /* cannot be EEXIST due to usage in aoa_fabric_register */ return -EBUSY; - alsa_card = snd_card_new(index, name, mod, sizeof(struct aoa_card)); - if (!alsa_card) - return -ENOMEM; + err = snd_card_create(index, name, mod, sizeof(struct aoa_card), + &alsa_card); + if (err < 0) + return err; aoa_card = alsa_card->private_data; aoa_card->alsa_card = alsa_card; alsa_card->dev = dev; |