diff options
author | Rongrong Cao <rrcao@ambarella.com> | 2009-07-10 15:13:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-13 18:01:29 -0400 |
commit | 087d53ab11d538ce57b8a8e0ef899d7ee6a38548 (patch) | |
tree | 8eb8123505bfa43dd58902c86e321f8d05c0e791 | |
parent | 33e319fba727708ee45fec70091c498da4e8f606 (diff) |
ASoC: fix checking for external widgets bug
In SOC DAPM layer of SOUND subsystem, when add signal route (in the
function snd_soc_dapm_add_route() ), the original code has wrong logic
when dapm layer check each widget whether an external one.
Signed-off-by: Rongrong Cao <rrcao@ambarella.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/soc-dapm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index a40594f5ad66..c68c204a48ad 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -1293,8 +1293,8 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec, | |||
1293 | if (wsink->id == snd_soc_dapm_input) { | 1293 | if (wsink->id == snd_soc_dapm_input) { |
1294 | if (wsource->id == snd_soc_dapm_micbias || | 1294 | if (wsource->id == snd_soc_dapm_micbias || |
1295 | wsource->id == snd_soc_dapm_mic || | 1295 | wsource->id == snd_soc_dapm_mic || |
1296 | wsink->id == snd_soc_dapm_line || | 1296 | wsource->id == snd_soc_dapm_line || |
1297 | wsink->id == snd_soc_dapm_output) | 1297 | wsource->id == snd_soc_dapm_output) |
1298 | wsink->ext = 1; | 1298 | wsink->ext = 1; |
1299 | } | 1299 | } |
1300 | if (wsource->id == snd_soc_dapm_output) { | 1300 | if (wsource->id == snd_soc_dapm_output) { |