diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-16 23:03:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-16 23:03:57 +0100 |
| commit | 96cf45cf559be375de29dd45afc50fa8946fb2aa (patch) | |
| tree | 06242d4256aadc01aee67dfafbb94541e7a17738 /sound/isa/sc6000.c | |
| parent | ALSA: isa/*: Add missing KERN_* prefix to printk (diff) | |
| parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
| download | linux-96cf45cf559be375de29dd45afc50fa8946fb2aa.tar.xz linux-96cf45cf559be375de29dd45afc50fa8946fb2aa.zip | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/isa/sc6000.c')
| -rw-r--r-- | sound/isa/sc6000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index bbc53692e68d..782010608ef4 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c @@ -489,9 +489,9 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) char __iomem *vmss_port; - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); - if (!card) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) + return err; if (xirq == SNDRV_AUTO_IRQ) { xirq = snd_legacy_find_free_irq(possible_irqs); |