Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-3.6

ASoC: Additional updates for 3.6

A few updates for issues discovered during the merge window, the main
one being the fix for the issues with defaulting to use of regmap
without properly checking if there was I/O in place already.

2 files changed, 6 insertions, 6 deletions

diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index d684df294c0c..e463529b38bb 100644
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -177,7 +177,7 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev)
         }
 
         alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);
-        if (alc5632->gpio_hp_det == -ENODEV)
+        if (alc5632->gpio_hp_det == -EPROBE_DEFER)
                 return -EPROBE_DEFER;
 
         ret = snd_soc_of_parse_card_name(card, "nvidia,model");
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 0c5bb33d258e..d4f14e492341 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -284,27 +284,27 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
         } else if (np) {
                 pdata->gpio_spkr_en = of_get_named_gpio(np,
                                                 "nvidia,spkr-en-gpios", 0);
-                if (pdata->gpio_spkr_en == -ENODEV)
+                if (pdata->gpio_spkr_en == -EPROBE_DEFER)
                         return -EPROBE_DEFER;
 
                 pdata->gpio_hp_mute = of_get_named_gpio(np,
                                                 "nvidia,hp-mute-gpios", 0);
-                if (pdata->gpio_hp_mute == -ENODEV)
+                if (pdata->gpio_hp_mute == -EPROBE_DEFER)
                         return -EPROBE_DEFER;
 
                 pdata->gpio_hp_det = of_get_named_gpio(np,
                                                 "nvidia,hp-det-gpios", 0);
-                if (pdata->gpio_hp_det == -ENODEV)
+                if (pdata->gpio_hp_det == -EPROBE_DEFER)
                         return -EPROBE_DEFER;
 
                 pdata->gpio_int_mic_en = of_get_named_gpio(np,
                                                 "nvidia,int-mic-en-gpios", 0);
-                if (pdata->gpio_int_mic_en == -ENODEV)
+                if (pdata->gpio_int_mic_en == -EPROBE_DEFER)
                         return -EPROBE_DEFER;
 
                 pdata->gpio_ext_mic_en = of_get_named_gpio(np,
                                                 "nvidia,ext-mic-en-gpios", 0);
-                if (pdata->gpio_ext_mic_en == -ENODEV)
+                if (pdata->gpio_ext_mic_en == -EPROBE_DEFER)
                         return -EPROBE_DEFER;
         }