Commit 08bb5dc6 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: rt711: fix calibrate mutex initialization

Follow the same flow as rt711-sdca and initialize all mutexes at probe
time.
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220606203752.144159-5-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent fe154c4f
...@@ -474,6 +474,9 @@ static int rt711_sdw_remove(struct sdw_slave *slave) ...@@ -474,6 +474,9 @@ static int rt711_sdw_remove(struct sdw_slave *slave)
if (rt711->first_hw_init) if (rt711->first_hw_init)
pm_runtime_disable(&slave->dev); pm_runtime_disable(&slave->dev);
mutex_destroy(&rt711->calibrate_mutex);
mutex_destroy(&rt711->disable_irq_lock);
return 0; return 0;
} }
......
...@@ -1204,6 +1204,7 @@ int rt711_init(struct device *dev, struct regmap *sdw_regmap, ...@@ -1204,6 +1204,7 @@ int rt711_init(struct device *dev, struct regmap *sdw_regmap,
rt711->sdw_regmap = sdw_regmap; rt711->sdw_regmap = sdw_regmap;
rt711->regmap = regmap; rt711->regmap = regmap;
mutex_init(&rt711->calibrate_mutex);
mutex_init(&rt711->disable_irq_lock); mutex_init(&rt711->disable_irq_lock);
/* /*
...@@ -1318,7 +1319,6 @@ int rt711_io_init(struct device *dev, struct sdw_slave *slave) ...@@ -1318,7 +1319,6 @@ int rt711_io_init(struct device *dev, struct sdw_slave *slave)
rt711_jack_detect_handler); rt711_jack_detect_handler);
INIT_DELAYED_WORK(&rt711->jack_btn_check_work, INIT_DELAYED_WORK(&rt711->jack_btn_check_work,
rt711_btn_check_handler); rt711_btn_check_handler);
mutex_init(&rt711->calibrate_mutex);
INIT_WORK(&rt711->calibration_work, rt711_calibration_work); INIT_WORK(&rt711->calibration_work, rt711_calibration_work);
schedule_work(&rt711->calibration_work); schedule_work(&rt711->calibration_work);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment