mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
ASoC: rt711: fix calibrate mutex initialization
Follow the same flow as rt711-sdca and initialize all mutexes at probe time. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Rander Wang <rander.wang@intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20220606203752.144159-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
fe154c4ff3
commit
08bb5dc6ce
2 changed files with 4 additions and 1 deletions
|
@ -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,
|
||||||
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)
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue