diff options
| author |   Takashi Iwai <tiwai@alsa3.local> | 2008-12-28 16:43:35 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2009-01-12 15:20:26 +0100 |
| commit | c95eadd2f1afd2ba643e85a8dfc9079a3f03ae47 (patch) | |
| tree | 1fb2defba2bf3d4c299395b0f46d7902eb3b51ba /sound/isa/cs423x | |
| parent | ALSA: Introduce snd_card_create() (diff) | |
| download | linux-dev-c95eadd2f1afd2ba643e85a8dfc9079a3f03ae47.tar.xz linux-dev-c95eadd2f1afd2ba643e85a8dfc9079a3f03ae47.zip | |
ALSA: Convert to snd_card_create() in sound/isa/*
Convert from snd_card_new() to the new snd_card_create() function.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/cs423x')
| -rw-r--r-- | sound/isa/cs423x/cs4231.c | 6 | ||||
| -rw-r--r-- | sound/isa/cs423x/cs4236.c | 7 |
2 files changed, 7 insertions, 6 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) struct snd_pcm *pcm; int error; - card = snd_card_new(index[n], id[n], THIS_MODULE, 0); - if (!card) - return -EINVAL; + error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card); + if (error < 0) + return error; error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], dma2[n], WSS_HW_DETECT, 0, &chip); diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 019c9401663e..db830682804f 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c @@ -385,10 +385,11 @@ static void snd_card_cs4236_free(struct snd_card *card) static struct snd_card *snd_cs423x_card_new(int dev) { struct snd_card *card; + int err; - card = snd_card_new(index[dev], id[dev], THIS_MODULE, - sizeof(struct snd_card_cs4236)); - if (card == NULL) + err = snd_card_create(index[dev], id[dev], THIS_MODULE, + sizeof(struct snd_card_cs4236), &card); + if (err < 0) return NULL; card->private_free = snd_card_cs4236_free; return card; |