diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2020-11-11 12:54:34 -0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-11-18 17:59:23 +0000 |
| commit | 879ee8b6f2bae0cc4a25536f8841db1dbc969523 (patch) | |
| tree | e101b8361d2e0ec424196423863a9740ae7920c9 /sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | |
| parent | Merge Intel catpt DSP fixes into asoc-5.10 (diff) | |
| download | linux-dev-879ee8b6f2bae0cc4a25536f8841db1dbc969523.tar.xz linux-dev-879ee8b6f2bae0cc4a25536f8841db1dbc969523.zip | |
ASOC: Intel: kbl_rt5663_rt5514_max98927: Do not try to disable disabled clock
In kabylake_set_bias_level(), enabling mclk may fail if the clock has
already been enabled by the firmware. Attempts to disable that clock
later will fail with a warning backtrace.
mclk already disabled
WARNING: CPU: 2 PID: 108 at drivers/clk/clk.c:952 clk_core_disable+0x1b6/0x1cf
...
Call Trace:
clk_disable+0x2d/0x3a
kabylake_set_bias_level+0x72/0xfd [snd_soc_kbl_rt5663_rt5514_max98927]
snd_soc_card_set_bias_level+0x2b/0x6f
snd_soc_dapm_set_bias_level+0xe1/0x209
dapm_pre_sequence_async+0x63/0x96
async_run_entry_fn+0x3d/0xd1
process_one_work+0x2a9/0x526
...
Only disable the clock if it has been enabled.
Fixes: 15747a802075 ("ASoC: eve: implement set_bias_level function for rt5514")
Cc: Brent Lu <brent.lu@intel.com>
Cc: Curtis Malainey <cujomalainey@chromium.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20201111205434.207610-1-linux@roeck-us.net
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c')
| -rw-r--r-- | sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 922cd0176e1f..f95546c184aa 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -700,6 +700,8 @@ static int kabylake_set_bias_level(struct snd_soc_card *card, switch (level) { case SND_SOC_BIAS_PREPARE: if (dapm->bias_level == SND_SOC_BIAS_ON) { + if (!__clk_is_enabled(priv->mclk)) + return 0; dev_dbg(card->dev, "Disable mclk"); clk_disable_unprepare(priv->mclk); } else { |