diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 09:22:14 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 09:22:14 (GMT) |
| commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
| tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/arm | |
| parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | linux-a5e0e970c06065a14844b406a0c2a59776a1ccc6.tar.xz | |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/aaci.c | 7 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 7 | ||||
| -rw-r--r-- | sound/arm/sa11xx-uda1341.c | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 772901e..7fbd68f 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -995,10 +995,11 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev) { struct aaci *aaci; struct snd_card *card; + int err; - card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, - THIS_MODULE, sizeof(struct aaci)); - if (card == NULL) + err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, + THIS_MODULE, sizeof(struct aaci), &card); + if (err < 0) return NULL; card->private_free = aaci_free_card; diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 85cf591..7ed100c 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -173,10 +173,9 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) struct snd_ac97_template ac97_template; int ret; - ret = -ENOMEM; - card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, - THIS_MODULE, 0); - if (!card) + ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, + THIS_MODULE, 0, &card); + if (ret < 0) goto err; card->dev = &dev->dev; diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index 1dcd51d..51d708c 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c @@ -887,9 +887,10 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr) struct sa11xx_uda1341 *chip; /* register the soundcard */ - card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct sa11xx_uda1341)); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(-1, id, THIS_MODULE, + sizeof(struct sa11xx_uda1341), &card); + if (err < 0) + return err; chip = card->private_data; spin_lock_init(&chip->s[0].dma_lock); |