UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-2.6.29' into for-2.6.30

This commit is contained in:
Mark Brown 2009-02-13 14:02:08 +00:00
parent d5e9ba1d58 14fa43f53f
commit c85e5a4161
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/soc-core.c
View File

@ -1382,7 +1382,10 @@ int snd_soc_init_card(struct snd_soc_device *socdev)
mutex_lock(&codec->mutex); mutex_lock(&codec->mutex);
#ifdef CONFIG_SND_SOC_AC97_BUS #ifdef CONFIG_SND_SOC_AC97_BUS
if (ac97) { /* Only instantiate AC97 if not already done by the adaptor
* for the generic AC97 subsystem.
*/
if (ac97 && strcmp(codec->name, "AC97") != 0) {
ret = soc_ac97_dev_register(codec); ret = soc_ac97_dev_register(codec);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "asoc: AC97 device register failed\n"); printk(KERN_ERR "asoc: AC97 device register failed\n");