---

yaml --- r: 257512 b: refs/heads/master c: ffdaa48 h: refs/heads/master v: v3
git-mirror · Jun 8, 2011 · 74f6a19 · 74f6a19
1 parent 1e2d021
commit 74f6a19
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0168bf0d130de83cd3532b834237c6228a6158dd
+refs/heads/master: ffdaa48aed8dae94037b26a2f9050128facfaa2e
diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c
@@ -610,7 +610,7 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec)
 	struct rb_node *node;
 	struct snd_soc_rbtree_node *rbnode;
 	unsigned int regtmp;
-	unsigned int val;
+	unsigned int val, def;
 	int ret;
 	int i;
 
@@ -622,6 +622,11 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec)
 			WARN_ON(codec->writable_register &&
 				codec->writable_register(codec, regtmp));
 			val = snd_soc_rbtree_get_register(rbnode, i);
+			def = snd_soc_get_cache_val(codec->reg_def_copy, i,
+						    rbnode->word_size);
+			if (val == def)
+				continue;
+
 			codec->cache_bypass = 1;
 			ret = snd_soc_write(codec, regtmp, val);
 			codec->cache_bypass = 0;