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/pcxhr | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | kernel_samsung_espresso10-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.zip kernel_samsung_espresso10-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.gz kernel_samsung_espresso10-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.bz2 | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/pcxhr')
| -rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 27cf2c2..7f95459 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c @@ -1510,12 +1510,12 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, snprintf(tmpid, sizeof(tmpid), "%s-%d", id[dev] ? id[dev] : card_name, i); - card = snd_card_new(idx, tmpid, THIS_MODULE, 0); + err = snd_card_create(idx, tmpid, THIS_MODULE, 0, &card); - if (! card) { + if (err < 0) { snd_printk(KERN_ERR "cannot allocate the card %d\n", i); pcxhr_free(mgr); - return -ENOMEM; + return err; } strcpy(card->driver, DRIVER_NAME); |