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/bt87x.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/bt87x.c')
| -rw-r--r-- | sound/pci/bt87x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 1aa1c0402540..a299340519df 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
| @@ -888,9 +888,9 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci, | |||
| 888 | return -ENOENT; | 888 | return -ENOENT; |
| 889 | } | 889 | } |
| 890 | 890 | ||
| 891 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 891 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 892 | if (!card) | 892 | if (err < 0) |
| 893 | return -ENOMEM; | 893 | return err; |
| 894 | 894 | ||
| 895 | err = snd_bt87x_create(card, pci, &chip); | 895 | err = snd_bt87x_create(card, pci, &chip); |
| 896 | if (err < 0) | 896 | if (err < 0) |