diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 04:22:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 04:22:14 -0500 |
| commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
| tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/pci/ice1712/ice1724.c | |
| parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
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 bb8d8c766b9d..7ff36d3f0f44 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, | |||
| 2456 | return -ENOENT; | 2456 | return -ENOENT; |
| 2457 | } | 2457 | } |
| 2458 | 2458 | ||
| 2459 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 2459 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 2460 | if (card == NULL) | 2460 | if (err < 0) |
| 2461 | return -ENOMEM; | 2461 | return err; |
| 2462 | 2462 | ||
| 2463 | strcpy(card->driver, "ICE1724"); | 2463 | strcpy(card->driver, "ICE1724"); |
| 2464 | strcpy(card->shortname, "ICEnsemble ICE1724"); | 2464 | strcpy(card->shortname, "ICEnsemble ICE1724"); |