aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@alsa3.local>2008-12-28 10:45:02 -0500
committerTakashi Iwai <tiwai@suse.de>2009-01-12 09:21:19 -0500
commitbd7dd77c2a05c530684eea2e3af16449ae9c5d52 (patch)
treef26e8b6c83ed58d3c2d47f9df6373812db80a885 /sound/soc/soc-core.c
parente58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 (diff)
ALSA: Convert to snd_card_create() in other sound/*
Convert from snd_card_new() to the new snd_card_create() function in other sound subdirectories. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6cbe7e82f23..318dfdd54d7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1311,17 +1311,17 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
1311{ 1311{
1312 struct snd_soc_codec *codec = socdev->codec; 1312 struct snd_soc_codec *codec = socdev->codec;
1313 struct snd_soc_card *card = socdev->card; 1313 struct snd_soc_card *card = socdev->card;
1314 int ret = 0, i; 1314 int ret, i;
1315 1315
1316 mutex_lock(&codec->mutex); 1316 mutex_lock(&codec->mutex);
1317 1317
1318 /* register a sound card */ 1318 /* register a sound card */
1319 codec->card = snd_card_new(idx, xid, codec->owner, 0); 1319 ret = snd_card_create(idx, xid, codec->owner, 0, &codec->card);
1320 if (!codec->card) { 1320 if (ret < 0) {
1321 printk(KERN_ERR "asoc: can't create sound card for codec %s\n", 1321 printk(KERN_ERR "asoc: can't create sound card for codec %s\n",
1322 codec->name); 1322 codec->name);
1323 mutex_unlock(&codec->mutex); 1323 mutex_unlock(&codec->mutex);
1324 return -ENODEV; 1324 return ret;
1325 } 1325 }
1326 1326
1327 codec->card->dev = socdev->dev; 1327 codec->card->dev = socdev->dev;