1 files changed, 10 insertions, 4 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 359c2849b364..b322cf294d06 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1137,6 +1137,16 @@ static int soc_probe_codec(struct snd_soc_card *card,
 
         codec->dapm.idle_bias_off = driver->idle_bias_off;
 
+        if (!codec->write && dev_get_regmap(codec->dev, NULL)) {
+                /* Set the default I/O up try regmap */
+                ret = snd_soc_codec_set_cache_io(codec, NULL);
+                if (ret < 0) {
+                        dev_err(codec->dev,
+                                "Failed to set cache I/O: %d\n", ret);
+                        goto err_probe;
+                }
+        }
+
         if (driver->probe) {
                 ret = driver->probe(codec);
                 if (ret < 0) {
@@ -1150,10 +1160,6 @@ static int soc_probe_codec(struct snd_soc_card *card,
                         codec->name);
         }
 
-        /* If the driver didn't set I/O up try regmap */
-        if (!codec->write && dev_get_regmap(codec->dev, NULL))
-                snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
-
         if (driver->controls)
                 snd_soc_add_codec_controls(codec, driver->controls,
                                      driver->num_controls);