lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 018/140] ASoC: intel: sof_rt5682: add remove function to disable jack
    Date
    From: Jaska Uimonen <jaska.uimonen@intel.com>

    [ Upstream commit 6ba5041c23c1062d4e8287b2b76a1181538c6df1 ]

    When removing sof module the rt5682 jack handler will oops
    if jack detection is not disabled. So add remove function,
    which disables the jack detection.

    Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20190927201408.925-5-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/intel/boards/sof_rt5682.c | 16 ++++++++++++++++
    1 file changed, 16 insertions(+)

    diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
    index daeaa396d9281..239eef128c2b7 100644
    --- a/sound/soc/intel/boards/sof_rt5682.c
    +++ b/sound/soc/intel/boards/sof_rt5682.c
    @@ -618,8 +618,24 @@ static int sof_audio_probe(struct platform_device *pdev)
    &sof_audio_card_rt5682);
    }

    +static int sof_rt5682_remove(struct platform_device *pdev)
    +{
    + struct snd_soc_card *card = platform_get_drvdata(pdev);
    + struct snd_soc_component *component = NULL;
    +
    + for_each_card_components(card, component) {
    + if (!strcmp(component->name, rt5682_component[0].name)) {
    + snd_soc_component_set_jack(component, NULL, NULL);
    + break;
    + }
    + }
    +
    + return 0;
    +}
    +
    static struct platform_driver sof_audio = {
    .probe = sof_audio_probe,
    + .remove = sof_rt5682_remove,
    .driver = {
    .name = "sof_rt5682",
    .pm = &snd_soc_pm_ops,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-08 20:05    [W:2.028 / U:0.620 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site