1 files changed, 13 insertions, 6 deletions

diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index a42e9ac30f28..be27f1d229af 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -56,6 +56,7 @@
 #define GPIO_HP_MUTE    BIT(1)
 #define GPIO_INT_MIC_EN BIT(2)
 #define GPIO_EXT_MIC_EN BIT(3)
+#define GPIO_HP_DET     BIT(4)
 
 struct tegra_wm8903 {
         struct tegra_asoc_utils_data util_data;
@@ -304,6 +305,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
                 snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack,
                                         1,
                                         &tegra_wm8903_hp_jack_gpio);
+                machine->gpio_requested |= GPIO_HP_DET;
         }
 
         snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
@@ -317,7 +319,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
 
         /* FIXME: Calculate automatically based on DAPM routes? */
-        if (!machine_is_harmony() && !machine_is_ventana())
+        if (!machine_is_harmony())
                 snd_soc_dapm_nc_pin(dapm, "IN1L");
         if (!machine_is_seaboard() && !machine_is_aebl())
                 snd_soc_dapm_nc_pin(dapm, "IN1R");
@@ -393,7 +395,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, card);
         snd_soc_card_set_drvdata(card, machine);
 
-        if (machine_is_harmony() || machine_is_ventana()) {
+        if (machine_is_harmony()) {
                 card->dapm_routes = harmony_audio_map;
                 card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map);
         } else if (machine_is_seaboard()) {
@@ -429,10 +431,10 @@ static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
         struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
         struct tegra_wm8903_platform_data *pdata = machine->pdata;
 
-        snd_soc_unregister_card(card);
-
-        tegra_asoc_utils_fini(&machine->util_data);
-
+        if (machine->gpio_requested & GPIO_HP_DET)
+                snd_soc_jack_free_gpios(&tegra_wm8903_hp_jack,
+                                        1,
+                                        &tegra_wm8903_hp_jack_gpio);
         if (machine->gpio_requested & GPIO_EXT_MIC_EN)
                 gpio_free(pdata->gpio_ext_mic_en);
         if (machine->gpio_requested & GPIO_INT_MIC_EN)
@@ -441,6 +443,11 @@ static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
                 gpio_free(pdata->gpio_hp_mute);
         if (machine->gpio_requested & GPIO_SPKR_EN)
                 gpio_free(pdata->gpio_spkr_en);
+        machine->gpio_requested = 0;
+
+        snd_soc_unregister_card(card);
+
+        tegra_asoc_utils_fini(&machine->util_data);
 
         kfree(machine);