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/sgalaxy.c | |
| parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | op-kernel-dev-96cf45cf559be375de29dd45afc50fa8946fb2aa.zip op-kernel-dev-96cf45cf559be375de29dd45afc50fa8946fb2aa.tar.gz | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/isa/sgalaxy.c')
| -rw-r--r-- | sound/isa/sgalaxy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c index 2c7503b..6fe27b9 100644 --- a/sound/isa/sgalaxy.c +++ b/sound/isa/sgalaxy.c @@ -243,9 +243,9 @@ static int __devinit snd_sgalaxy_probe(struct device *devptr, unsigned int dev) struct snd_card *card; struct snd_wss *chip; - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) + return err; xirq = irq[dev]; if (xirq == SNDRV_AUTO_IRQ) { |
