diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 12:57:37 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 12:57:37 -0400 |
| commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
| tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/isa/cs423x/cs4231.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Diffstat (limited to 'sound/isa/cs423x/cs4231.c')
| -rw-r--r-- | sound/isa/cs423x/cs4231.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c index f019d449e2d6..cb9153e75b82 100644 --- a/sound/isa/cs423x/cs4231.c +++ b/sound/isa/cs423x/cs4231.c | |||
| @@ -95,9 +95,9 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) | |||
| 95 | struct snd_pcm *pcm; | 95 | struct snd_pcm *pcm; |
| 96 | int error; | 96 | int error; |
| 97 | 97 | ||
| 98 | card = snd_card_new(index[n], id[n], THIS_MODULE, 0); | 98 | error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card); |
| 99 | if (!card) | 99 | if (error < 0) |
| 100 | return -EINVAL; | 100 | return error; |
| 101 | 101 | ||
| 102 | error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], dma2[n], | 102 | error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], dma2[n], |
| 103 | WSS_HW_DETECT, 0, &chip); | 103 | WSS_HW_DETECT, 0, &chip); |