diff options
| author | Tzung-Bi Shih <tzungbi@google.com> | 2019-05-07 12:12:18 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-08 10:11:53 +0200 |
| commit | bdb8fa6b09a801a6cbe3c2487f0228860f9c5aba (patch) | |
| tree | e1605a3c2d013c4c5bfd1e690688bf2713871629 | |
| parent | ASoC: SOF: core: fix undefined nocodec reference (diff) | |
| download | linux-bdb8fa6b09a801a6cbe3c2487f0228860f9c5aba.tar.xz linux-bdb8fa6b09a801a6cbe3c2487f0228860f9c5aba.zip | |
ASoC: mediatek: mt6358: initialize setting when ramping volume
Mt6358 ramps up from the smallest volume (i.e. -10dB) to target dB when
opening and ramps down from target dB to mute (i.e. -40dB) when closing.
If target is equal to -10dB when opening, headset_volume_ramp() simply
leaves current setting (which may not be -10dB) unchanged.
Execute the loop at least once to initialize the setting to the
starting point (i.e. from).
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/mt6358.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/mt6358.c b/sound/soc/codecs/mt6358.c index d4c4fee6d3d9..96547ae50a5d 100644 --- a/sound/soc/codecs/mt6358.c +++ b/sound/soc/codecs/mt6358.c @@ -405,10 +405,9 @@ static bool is_valid_hp_pga_idx(int reg_idx) reg_idx == DL_GAIN_N_40DB; } -static void headset_volume_ramp(struct mt6358_priv *priv, - int from, int to) +static void headset_volume_ramp(struct mt6358_priv *priv, int from, int to) { - int offset = 0, count = 1, reg_idx; + int offset = 0, count = 0, reg_idx; if (!is_valid_hp_pga_idx(from) || !is_valid_hp_pga_idx(to)) dev_warn(priv->dev, "%s(), volume index is not valid, from %d, to %d\n", @@ -422,7 +421,7 @@ static void headset_volume_ramp(struct mt6358_priv *priv, else offset = from - to; - while (offset > 0) { + while (offset >= 0) { if (to > from) reg_idx = from + count; else |