UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Intel: broadwell: Fix oops during module removal 

When removing the SOF module, the RT286 jack detect
handler will oops if jack detection is not disabled.
Disable the jack in the machine driver remove callback
to prevent this. This fix is only for SOF support and is
not needed for earlier versions.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200427162953.21107-1-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2020-04-27 09:29:53 -07:00 committed by Mark Brown
parent be8499c48f
commit 8382f2949a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/intel/boards/broadwell.c
View File

@ -230,7 +230,8 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
},
};
static int broadwell_suspend(struct snd_soc_card *card){
static int broadwell_disable_jack(struct snd_soc_card *card)
{
struct snd_soc_component *component;
for_each_card_components(card, component) {
@ -241,9 +242,15 @@ static int broadwell_suspend(struct snd_soc_card *card){
break;
}
}
return 0;
}
static int broadwell_suspend(struct snd_soc_card *card)
{
return broadwell_disable_jack(card);
}
static int broadwell_resume(struct snd_soc_card *card){
struct snd_soc_component *component;
@ -292,8 +299,16 @@ static int broadwell_audio_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
}
static int broadwell_audio_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
return broadwell_disable_jack(card);
}
static struct platform_driver broadwell_audio = {
.probe = broadwell_audio_probe,
.remove = broadwell_audio_remove,
.driver = {
.name = "broadwell-audio",
},