diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-03 22:41:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-04 16:50:19 +0100 |
| commit | 565631008f6dd27c3e975c2103141f344d80b84e (patch) | |
| tree | 77e63417d1024fd8b9a7b81d54100b422d120d6e | |
| parent | d805002befc52a7edbfb0ec202a10a767e67515d (diff) | |
| download | linux-stable-565631008f6dd27c3e975c2103141f344d80b84e.tar.gz linux-stable-565631008f6dd27c3e975c2103141f344d80b84e.tar.bz2 linux-stable-565631008f6dd27c3e975c2103141f344d80b84e.zip | |
ASoC: Mark headphone, mic, speaker and line widgets as always connected
We're not actually doing any dynamic power management based on connection
and output drivers (which are pretty much the same thing) are marked as
unconditionally connected already.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/soc-dapm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c1f3563133bc..cb00918b08d6 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -318,7 +318,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, } } break; - /* does not effect routing - always connected */ + /* does not affect routing - always connected */ case snd_soc_dapm_pga: case snd_soc_dapm_out_drv: case snd_soc_dapm_output: @@ -330,13 +330,13 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, case snd_soc_dapm_supply: case snd_soc_dapm_aif_in: case snd_soc_dapm_aif_out: - p->connect = 1; - break; - /* does effect routing - dynamically connected */ case snd_soc_dapm_hp: case snd_soc_dapm_mic: case snd_soc_dapm_spk: case snd_soc_dapm_line: + p->connect = 1; + break; + /* does affect routing - dynamically connected */ case snd_soc_dapm_pre: case snd_soc_dapm_post: p->connect = 0; |