[alsa-devel] Couple of ASOC v2 snd-core issues
I had to fix these to get my drivers to load.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1ead550..4358f74 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1330,7 +1331,7 @@ int snd_soc_codec_add_dai(struct snd_soc_codec *codec, if (dai_runtime == NULL) goto err; - dai_runtime->dai = dai; + dai_runtime->dai = dai++; dai_runtime->codec = codec; list_add(&dai_runtime->list, &codec->dai_list); @@ -1382,7 +1383,7 @@ int snd_soc_platform_add_dai(struct snd_soc_platform *platform, if (dai_runtime == NULL) goto err; - dai_runtime->dai = dai; + dai_runtime->dai = dai++; dai_runtime->platform = platform; list_add(&dai_runtime->list, &platform->dai_list); @@ -1479,6 +1480,7 @@ int snd_soc_codec_create(struct snd_soc_machine *machine, codec->dev.parent = machine->dev; codec->dev.release = codec_dev_release; codec->machine = machine; + codec->name = (char *)codec_id; mutex_init(&codec->mutex); INIT_LIST_HEAD(&codec->dai_list);
On Tue, 2008-01-29 at 11:18 -0500, Jon Smirl wrote:
I had to fix these to get my drivers to load.
Thanks. Will apply to V2 branch.
Liam
Privacy & Confidentiality Notice ------------------------------------------------- This message and any attachments contain privileged and confidential information that is intended solely for the person(s) to whom it is addressed. If you are not an intended recipient you must not: read; copy; distribute; discuss; take any action in or make any reliance upon the contents of this message; nor open or read any attachment. If you have received this message in error, please notify us as soon as possible on the following telephone number and destroy this message including any attachments. Thank you. ------------------------------------------------- Wolfson Microelectronics plc Tel: +44 (0)131 272 7000 Fax: +44 (0)131 272 7001 Web: www.wolfsonmicro.com
Registered in Scotland
Company number SC089839
Registered office:
Westfield House, 26 Westfield Road, Edinburgh, EH11 2QB, UK
participants (2)
-
Jon Smirl
-
Liam Girdwood