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/ali5451/ali5451.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/ali5451/ali5451.c')
| -rw-r--r-- | sound/pci/ali5451/ali5451.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 1a0fd65ec280..b36c551da566 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
| @@ -2307,9 +2307,9 @@ static int __devinit snd_ali_probe(struct pci_dev *pci, | |||
| 2307 | 2307 | ||
| 2308 | snd_ali_printk("probe ...\n"); | 2308 | snd_ali_printk("probe ...\n"); |
| 2309 | 2309 | ||
| 2310 | card = snd_card_new(index, id, THIS_MODULE, 0); | 2310 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
| 2311 | if (!card) | 2311 | if (err < 0) |
| 2312 | return -ENOMEM; | 2312 | return err; |
| 2313 | 2313 | ||
| 2314 | err = snd_ali_create(card, pci, pcm_channels, spdif, &codec); | 2314 | err = snd_ali_create(card, pci, pcm_channels, spdif, &codec); |
| 2315 | if (err < 0) | 2315 | if (err < 0) |