diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 02:35:35 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 02:35:35 +0300 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/aoa/core/alsa.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | linux-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.xz | |
Merge branch 'topic/snd_card_new-err' into for-linus
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; |