Commit c85e5a41 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.29' into for-2.6.30

parents d5e9ba1d 14fa43f5

sound/soc/soc-core.c

+4 −1
Original line number Diff line number Diff line
@@ -1382,7 +1382,10 @@ int snd_soc_init_card(struct snd_soc_device *socdev) 


	mutex_lock(&codec->mutex);

#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);

		if (ret < 0) {

			printk(KERN_ERR "asoc: AC97 device register failed\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE