summaryrefslogtreecommitdiffstats
path: root/sound/arm/aaci.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:35 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:35 +0100
commitdec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch)
treeaf1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/arm/aaci.c
parent8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
downloadop-kernel-dev-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.zip
op-kernel-dev-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.gz
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/arm/aaci.c')
-rw-r--r--sound/arm/aaci.c7
1 files changed, 4 insertions, 3 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;
OpenPOWER on IntegriCloud