summaryrefslogtreecommitdiff
path: root/sound/isa/sc6000.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-16 23:03:57 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-16 23:03:57 +0100
commit96cf45cf559be375de29dd45afc50fa8946fb2aa (patch)
tree06242d4256aadc01aee67dfafbb94541e7a17738 /sound/isa/sc6000.c
parent4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
downloadlinux-3.10-96cf45cf559be375de29dd45afc50fa8946fb2aa.tar.gz
linux-3.10-96cf45cf559be375de29dd45afc50fa8946fb2aa.tar.bz2
linux-3.10-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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
index bbc53692e68..782010608ef 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);