diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-28 07:08:32 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-28 07:08:32 (GMT) |
| commit | 67fcdead3c7424d51e7108c220c9ab1a5e752ed3 (patch) | |
| tree | 3c48fabced8e519ef3f83209a793dfea48dbbfa8 /sound/pci/als4000.c | |
| parent | 006f367e38fb45e2f161c0f500c74449ae63e866 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | linux-fsl-qoriq-67fcdead3c7424d51e7108c220c9ab1a5e752ed3.tar.xz | |
Merge branch 'topic/snd_card_new-err' into topic/asoc
Conflicts:
sound/soc/soc-core.c
Diffstat (limited to 'sound/pci/als4000.c')
| -rw-r--r-- | sound/pci/als4000.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index ba57005..542a0c6 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c @@ -889,12 +889,13 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci, pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO); pci_set_master(pci); - card = snd_card_new(index[dev], id[dev], THIS_MODULE, - sizeof(*acard) /* private_data: acard */); - if (card == NULL) { + err = snd_card_create(index[dev], id[dev], THIS_MODULE, + sizeof(*acard) /* private_data: acard */, + &card); + if (err < 0) { pci_release_regions(pci); pci_disable_device(pci); - return -ENOMEM; + return err; } acard = card->private_data; |