1 files changed, 13 insertions, 3 deletions

diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
index 0283cfb7c031..ce73e1f62c4b 100644
--- a/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@ -145,6 +145,18 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
         return 0;
 }
 
+static int tegra_max98090_card_remove(struct snd_soc_card *card)
+{
+        struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);
+
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                snd_soc_jack_free_gpios(&tegra_max98090_hp_jack, 1,
+                                        &tegra_max98090_hp_jack_gpio);
+        }
+
+        return 0;
+}
+
 static struct snd_soc_dai_link tegra_max98090_dai = {
         .name = "max98090",
         .stream_name = "max98090 PCM",
@@ -158,6 +170,7 @@ static struct snd_soc_dai_link tegra_max98090_dai = {
 static struct snd_soc_card snd_soc_tegra_max98090 = {
         .name = "tegra-max98090",
         .owner = THIS_MODULE,
+        .remove = tegra_max98090_card_remove,
         .dai_link = &tegra_max98090_dai,
         .num_links = 1,
         .controls = tegra_max98090_controls,
@@ -241,9 +254,6 @@ static int tegra_max98090_remove(struct platform_device *pdev)
         struct snd_soc_card *card = platform_get_drvdata(pdev);
         struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);
 
-        snd_soc_jack_free_gpios(&tegra_max98090_hp_jack, 1,
-                                &tegra_max98090_hp_jack_gpio);
-
         snd_soc_unregister_card(card);
 
         tegra_asoc_utils_fini(&machine->util_data);