---

yaml --- r: 321365 b: refs/heads/master c: 98d3088 h: refs/heads/master i: 321363: 1ce8f93 v: v3
git-mirror · Aug 2, 2012 · 44051ef · 44051ef
1 parent 6929155
commit 44051ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d40e5582c9c4cfb6977ba2a0ca9c2ed82c56f21
+refs/heads/master: 98d3088e534a2a61f6690b5426909b0c3b57a785
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -1096,7 +1096,7 @@ static int soc_probe_codec(struct snd_soc_card *card,
 	}
 
 	/* If the driver didn't set I/O up try regmap */
-	if (!codec->control_data)
+	if (!codec->write && dev_get_regmap(codec->dev, NULL))
 		snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
 
 	if (driver->controls)