diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 17:57:37 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 17:57:37 +0100 |
commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/arm | |
parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
download | kernel_samsung_smdk4412-dbe36c9dd571e035078207862766963c4fc80262.tar.gz kernel_samsung_smdk4412-dbe36c9dd571e035078207862766963c4fc80262.tar.bz2 kernel_samsung_smdk4412-dbe36c9dd571e035078207862766963c4fc80262.zip |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
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 89096e811a4..7d39aac9ec1 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 85cf591d4e1..7ed100c80a5 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 ed481a866a3..7101d3d8bae 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); |