3 files changed, 14 insertions, 6 deletions

diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 474dc72b4d8d..db51007a6a43 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1622,6 +1622,12 @@ static int wm8993_probe(struct snd_soc_codec *codec)
         wm_hubs_add_analogue_routes(codec, wm8993->pdata.lineout1_diff,
                                     wm8993->pdata.lineout2_diff);
 
+        /* If the line outputs are differential then we aren't presenting
+         * VMID as an output and can disable it.
+         */
+        if (wm8993->pdata.lineout1_diff && wm8993->pdata.lineout2_diff)
+                codec->dapm.idle_bias_off = 1;
+
         return 0;
 
 }
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 11ca19b72d7d..c26291844e5d 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3396,10 +3396,18 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
         pm_runtime_enable(codec->dev);
         pm_runtime_resume(codec->dev);
 
+        /* By default use idle_bias_off, will override for WM8994 */
+        codec->dapm.idle_bias_off = 1;
+
         /* Set revision-specific configuration */
         wm8994->revision = snd_soc_read(codec, WM8994_CHIP_REVISION);
         switch (control->type) {
         case WM8994:
+                /* Single ended line outputs should have VMID on. */
+                if (!wm8994->pdata->lineout1_diff ||
+                    !wm8994->pdata->lineout2_diff)
+                        codec->dapm.idle_bias_off = 0;
+
                 switch (wm8994->revision) {
                 case 2:
                 case 3:
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 2a61094075f8..ec7d49033d4c 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -952,12 +952,6 @@ int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *codec,
                                     WM8993_LINEOUT2_MODE,
                                     WM8993_LINEOUT2_MODE);
 
-        /* If the line outputs are differential then we aren't presenting
-         * VMID as an output and can disable it.
-         */
-        if (lineout1_diff && lineout2_diff)
-                codec->dapm.idle_bias_off = 1;
-
         if (lineout1fb)
                 snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL,
                                     WM8993_LINEOUT1_FB, WM8993_LINEOUT1_FB);