diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-13 15:06:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-13 15:06:04 +0100 |
| commit | 99cbb86180bccd77f331f6e8eb7ce26aeea2cb72 (patch) | |
| tree | dcec4dd738b59a18d524e80e09491bfbf130501e /sound/soc/soc-core.c | |
| parent | 7c56c29a3bee36f71c7e37de88c9261d61e97e58 (diff) | |
| parent | 14fa43f53ff3a9c3d8b9662574b7369812a31a97 (diff) | |
| download | kernel_samsung_smdk4412-99cbb86180bccd77f331f6e8eb7ce26aeea2cb72.tar.gz kernel_samsung_smdk4412-99cbb86180bccd77f331f6e8eb7ce26aeea2cb72.tar.bz2 kernel_samsung_smdk4412-99cbb86180bccd77f331f6e8eb7ce26aeea2cb72.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 55fdb4abb17..ec3f8bb4b51 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1385,7 +1385,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"); |