diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-12 19:33:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-13 13:50:22 +0000 |
| commit | 14fa43f53ff3a9c3d8b9662574b7369812a31a97 (patch) | |
| tree | 4237aa05c40241c5c94fcc7e04685cb03873bd31 | |
| parent | 272edb00493af32c609f43bdf1d75141756fd999 (diff) | |
| download | op-kernel-dev-14fa43f53ff3a9c3d8b9662574b7369812a31a97.zip op-kernel-dev-14fa43f53ff3a9c3d8b9662574b7369812a31a97.tar.gz | |
ASoC: Only register AC97 bus if it's not done already
ASoC supports both explicit codec drivers for AC97 devices and a simple
driver which uses the standard ALSA AC97 framework for codec support.
When used with the generic AC97 codec support that will provide the
ad hoc AC97 device for drivers like touchscreens to attach to so the
core shouldn't do so.
Reported-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -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 55fdb4a..ec3f8bb 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"); |
