diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-16 17:03:57 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-16 17:03:57 -0500 |
| commit | 96cf45cf559be375de29dd45afc50fa8946fb2aa (patch) | |
| tree | 06242d4256aadc01aee67dfafbb94541e7a17738 /sound/isa/sc6000.c | |
| parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
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) | |||
| 489 | char __iomem *vmss_port; | 489 | char __iomem *vmss_port; |
| 490 | 490 | ||
| 491 | 491 | ||
| 492 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 492 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 493 | if (!card) | 493 | if (err < 0) |
| 494 | return -ENOMEM; | 494 | return err; |
| 495 | 495 | ||
| 496 | if (xirq == SNDRV_AUTO_IRQ) { | 496 | if (xirq == SNDRV_AUTO_IRQ) { |
| 497 | xirq = snd_legacy_find_free_irq(possible_irqs); | 497 | xirq = snd_legacy_find_free_irq(possible_irqs); |