diff --git a/[refs] b/[refs]
index 118f2192bb0f..6dafed4f0c75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51cc7ed3e378a60a3413a7e424f536e4dec3f39d
+refs/heads/master: 210cb67cb5b9f9a23b7ce91de50bab357440ba9d
diff --git a/trunk/sound/soc/soc-io.c b/trunk/sound/soc/soc-io.c
index 4d8dc6a27d4d..44d0174b4d97 100644
--- a/trunk/sound/soc/soc-io.c
+++ b/trunk/sound/soc/soc-io.c
@@ -142,6 +142,8 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 	case SND_SOC_REGMAP:
 		/* Device has made its own regmap arrangements */
 		codec->using_regmap = true;
+		if (!codec->control_data)
+			codec->control_data = dev_get_regmap(codec->dev, NULL);
 
 		ret = regmap_get_val_bytes(codec->control_data);
 		/* Errors are legitimate for non-integer byte multiples */