diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-16 17:03:57 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-16 17:03:57 -0500 |
| commit | 96cf45cf559be375de29dd45afc50fa8946fb2aa (patch) | |
| tree | 06242d4256aadc01aee67dfafbb94541e7a17738 /sound/pci/nm256/nm256.c | |
| parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/pci/nm256/nm256.c')
| -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: |