diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:08:33 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:08:33 -0500 |
| commit | 6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 (patch) | |
| tree | 2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179 /sound/pci/atiixp.c | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/atmel
Diffstat (limited to 'sound/pci/atiixp.c')
| -rw-r--r-- | sound/pci/atiixp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 226fe8237d31..9ce8548c03e4 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
| @@ -1645,9 +1645,9 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci, | |||
| 1645 | struct atiixp *chip; | 1645 | struct atiixp *chip; |
| 1646 | int err; | 1646 | int err; |
| 1647 | 1647 | ||
| 1648 | card = snd_card_new(index, id, THIS_MODULE, 0); | 1648 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
| 1649 | if (card == NULL) | 1649 | if (err < 0) |
| 1650 | return -ENOMEM; | 1650 | return err; |
| 1651 | 1651 | ||
| 1652 | strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA"); | 1652 | strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA"); |
| 1653 | strcpy(card->shortname, "ATI IXP"); | 1653 | strcpy(card->shortname, "ATI IXP"); |