diff options
author | Mark Brown <broonie@kernel.org> | 2020-05-12 16:12:47 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-05-12 16:12:47 +0100 |
commit | 132a0eb0324025bb4691ee590996dbe302159298 (patch) | |
tree | e70fcc3c1294f36f184f17b46bd82131cf71b686 /sound/soc/intel/boards/broadwell.c | |
parent | 66c705d07d784fb6b4622c6e47b6acae357472db (diff) | |
parent | 74fcfde748b26c68a8ab2791d9d73f698f7752d1 (diff) | |
download | linux-132a0eb0324025bb4691ee590996dbe302159298.tar.bz2 |
Merge branch 'for-5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.8
Diffstat (limited to 'sound/soc/intel/boards/broadwell.c')
-rw-r--r-- | sound/soc/intel/boards/broadwell.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index 07b2cfdadaeb..42f8723beef2 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -256,7 +256,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) { @@ -267,9 +268,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; @@ -318,8 +325,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", }, |