diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/pci/ca0106/ca0106_main.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/ca0106/ca0106_main.c')
| -rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 0e62205d4081..b116456e7707 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
| @@ -1707,9 +1707,9 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci, | |||
| 1707 | return -ENOENT; | 1707 | return -ENOENT; |
| 1708 | } | 1708 | } |
| 1709 | 1709 | ||
| 1710 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 1710 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 1711 | if (card == NULL) | 1711 | if (err < 0) |
| 1712 | return -ENOMEM; | 1712 | return err; |
| 1713 | 1713 | ||
| 1714 | err = snd_ca0106_create(dev, card, pci, &chip); | 1714 | err = snd_ca0106_create(dev, card, pci, &chip); |
| 1715 | if (err < 0) | 1715 | if (err < 0) |