diff options
| author | Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2015-12-17 20:35:48 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-19 11:49:56 +0000 |
| commit | 940a5a014d50e15269b5d197ab571d1ca9971c43 (patch) | |
| tree | c00da36e07ef2a0e755ef1a56a32f82c40315aca | |
| parent | 77095796ae9cbaf315f80611edb5aa569796e339 (diff) | |
| download | sound-unstable-940a5a014d50e15269b5d197ab571d1ca9971c43.tar.gz | |
ASoC: Intel: Atom: flip logic for gain Switch
The upstreamed code modified the control names from Mute to
Switch without changing the logic. To get audio working the Switch
needs to be off which isn't aligned with normal ALSA conventions.
Inverting the logic now so that Switch Off means mute and Switch On
means active audio using the specific volume setting.
Signed-off-by: Sebastien Guiriec <sebastien.guiriec@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/intel/atom/sst-atom-controls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index 1727cc4c7f8a7..b97e6adcf1b26 100644 --- a/sound/soc/intel/atom/sst-atom-controls.c +++ b/sound/soc/intel/atom/sst-atom-controls.c @@ -443,7 +443,7 @@ static int sst_gain_get(struct snd_kcontrol *kcontrol, break; case SST_GAIN_MUTE: - ucontrol->value.integer.value[0] = gv->mute ? 1 : 0; + ucontrol->value.integer.value[0] = gv->mute ? 0 : 1; break; case SST_GAIN_RAMP_DURATION: @@ -479,7 +479,7 @@ static int sst_gain_put(struct snd_kcontrol *kcontrol, break; case SST_GAIN_MUTE: - gv->mute = !!ucontrol->value.integer.value[0]; + gv->mute = !ucontrol->value.integer.value[0]; dev_dbg(cmpnt->dev, "%s: Mute %d\n", mc->pname, gv->mute); break; |