---

yaml --- r: 316284 b: refs/heads/master c: 38cbf95 h: refs/heads/master v: v3
git-mirror · Jul 3, 2012 · 827bc12 · 827bc12
1 parent c50ea51
commit 827bc12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 081413f206876e9d3755e1673828c7742fd00184
+refs/heads/master: 38cbf9598feba97de9f9b43efa9153fd7c1a2ec9
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -1095,6 +1095,10 @@ 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)
+		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);