diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:35 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:35 +0100 |
commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/pci/au88x0/au88x0.c | |
parent | Linux 2.6.29 (diff) | |
parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
download | linux-dev-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.xz linux-dev-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.zip |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/au88x0/au88x0.c')
-rw-r--r-- | sound/pci/au88x0/au88x0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c index a36d4d1fd419..9ec122383eef 100644 --- a/sound/pci/au88x0/au88x0.c +++ b/sound/pci/au88x0/au88x0.c @@ -250,9 +250,9 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) return -ENOENT; } // (2) - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) + return err; // (3) if ((err = snd_vortex_create(card, pci, &chip)) < 0) { |