lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic/snd_card_new-err' into for-linus

Browse Source
This commit is contained in:
Takashi Iwai
2009-03-24 00:35:35 +01:00
parent 8e0ee43bc2 b1a0aac05f
commit dec14f8c0e
111 changed files with 617 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/pci/hda/hda_intel.c
View File

@@ -2347,10 +2347,10 @@ static int __devinit azx_probe(struct pci_dev *pci,
return -ENOENT;
}
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (!card) {
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0) {
snd_printk(KERN_ERR SFX "Error creating card!\n");
return -ENOMEM;
return err;
}
err = azx_create(card, pci, dev, pci_id->driver_data, &chip);