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/vx222/vx222.c | |
| parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/pci/vx222/vx222.c')
| -rw-r--r-- | sound/pci/vx222/vx222.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c index acc352f4a441..fc9136c3e0d7 100644 --- a/sound/pci/vx222/vx222.c +++ b/sound/pci/vx222/vx222.c | |||
| @@ -204,9 +204,9 @@ static int __devinit snd_vx222_probe(struct pci_dev *pci, | |||
| 204 | return -ENOENT; | 204 | return -ENOENT; |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 207 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 208 | if (card == NULL) | 208 | if (err < 0) |
| 209 | return -ENOMEM; | 209 | return err; |
| 210 | 210 | ||
| 211 | switch ((int)pci_id->driver_data) { | 211 | switch ((int)pci_id->driver_data) { |
| 212 | case VX_PCI_VX222_OLD: | 212 | case VX_PCI_VX222_OLD: |