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/gus/gusclassic.c | |
| parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/isa/gus/gusclassic.c')
| -rw-r--r-- | sound/isa/gus/gusclassic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c index 426532a4d730..086b8f0e0f94 100644 --- a/sound/isa/gus/gusclassic.c +++ b/sound/isa/gus/gusclassic.c | |||
| @@ -148,9 +148,9 @@ static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n) | |||
| 148 | struct snd_gus_card *gus; | 148 | struct snd_gus_card *gus; |
| 149 | int error; | 149 | int error; |
| 150 | 150 | ||
| 151 | card = snd_card_new(index[n], id[n], THIS_MODULE, 0); | 151 | error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card); |
| 152 | if (!card) | 152 | if (error < 0) |
| 153 | return -EINVAL; | 153 | return error; |
| 154 | 154 | ||
| 155 | if (pcm_channels[n] < 2) | 155 | if (pcm_channels[n] < 2) |
| 156 | pcm_channels[n] = 2; | 156 | pcm_channels[n] = 2; |