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/cs4281.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 192e7842e181..b9b07f464631 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
| @@ -1925,9 +1925,9 @@ static int __devinit snd_cs4281_probe(struct pci_dev *pci, | |||
| 1925 | return -ENOENT; | 1925 | return -ENOENT; |
| 1926 | } | 1926 | } |
| 1927 | 1927 | ||
| 1928 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 1928 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 1929 | if (card == NULL) | 1929 | if (err < 0) |
| 1930 | return -ENOMEM; | 1930 | return err; |
| 1931 | 1931 | ||
| 1932 | if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) { | 1932 | if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) { |
| 1933 | snd_card_free(card); | 1933 | snd_card_free(card); |