diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 16:57:37 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 16:57:37 (GMT) |
| commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
| tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/pci/cs5530.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | linux-dbe36c9dd571e035078207862766963c4fc80262.tar.xz | |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Diffstat (limited to 'sound/pci/cs5530.c')
| -rw-r--r-- | sound/pci/cs5530.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index 6dea5b5..dc46432 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c @@ -258,10 +258,10 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci, return -ENOENT; } - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); - if (card == NULL) - return -ENOMEM; + if (err < 0) + return err; err = snd_cs5530_create(card, pci, &chip); if (err < 0) { |