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/nm256 | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/atmel
Diffstat (limited to 'sound/pci/nm256')
| -rw-r--r-- | sound/pci/nm256/nm256.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 50c9f8a05082..522a040855d4 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c | |||
| @@ -1668,9 +1668,9 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci, | |||
| 1668 | } | 1668 | } |
| 1669 | } | 1669 | } |
| 1670 | 1670 | ||
| 1671 | card = snd_card_new(index, id, THIS_MODULE, 0); | 1671 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
| 1672 | if (card == NULL) | 1672 | if (err < 0) |
| 1673 | return -ENOMEM; | 1673 | return err; |
| 1674 | 1674 | ||
| 1675 | switch (pci->device) { | 1675 | switch (pci->device) { |
| 1676 | case PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO: | 1676 | case PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO: |