diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-28 08:08:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-28 08:08:32 +0100 |
| commit | 67fcdead3c7424d51e7108c220c9ab1a5e752ed3 (patch) | |
| tree | 3c48fabced8e519ef3f83209a793dfea48dbbfa8 /sound/pci/ice1712/ice1724.c | |
| parent | 006f367e38fb45e2f161c0f500c74449ae63e866 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/asoc
Conflicts:
sound/soc/soc-core.c
Diffstat (limited to 'sound/pci/ice1712/ice1724.c')
| -rw-r--r-- | sound/pci/ice1712/ice1724.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index bb8d8c766b9..7ff36d3f0f4 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -2456,9 +2456,9 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci, return -ENOENT; } - 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; strcpy(card->driver, "ICE1724"); strcpy(card->shortname, "ICEnsemble ICE1724"); |