Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next

1 files changed, 13 insertions, 3 deletions

diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index 4511c5a875ec..4feb16a99e02 100644
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -128,6 +128,18 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)
         return 0;
 }
 
+static int tegra_rt5640_card_remove(struct snd_soc_card *card)
+{
+        struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);
+
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                snd_soc_jack_free_gpios(&tegra_rt5640_hp_jack, 1,
+                                        &tegra_rt5640_hp_jack_gpio);
+        }
+
+        return 0;
+}
+
 static struct snd_soc_dai_link tegra_rt5640_dai = {
         .name = "RT5640",
         .stream_name = "RT5640 PCM",
@@ -141,6 +153,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai = {
 static struct snd_soc_card snd_soc_tegra_rt5640 = {
         .name = "tegra-rt5640",
         .owner = THIS_MODULE,
+        .remove = tegra_rt5640_card_remove,
         .dai_link = &tegra_rt5640_dai,
         .num_links = 1,
         .controls = tegra_rt5640_controls,
@@ -224,9 +237,6 @@ static int tegra_rt5640_remove(struct platform_device *pdev)
         struct snd_soc_card *card = platform_get_drvdata(pdev);
         struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);
 
-        snd_soc_jack_free_gpios(&tegra_rt5640_hp_jack, 1,
-                                &tegra_rt5640_hp_jack_gpio);
-
         snd_soc_unregister_card(card);
 
         tegra_asoc_utils_fini(&machine->util_data);