From ebd334df3e46cfb1b8821024c6e0943849f9ee1b Mon Sep 17 00:00:00 2001 From: Dimitris Papastamos Date: Mon, 28 Mar 2011 11:39:15 +0100 Subject: [PATCH] --- yaml --- r: 248233 b: refs/heads/master c: f20eda5d8fafe35ca3c63ec8149a700a7db228a5 h: refs/heads/master i: 248231: 11b626cbc66f1da45a93f90c742f8a3d6b41c117 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-cache.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9086bd85ecab..43b9dd3865b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbda18245beff52ec1edf096e7a77d4cdf3effb9 +refs/heads/master: f20eda5d8fafe35ca3c63ec8149a700a7db228a5 diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c index 22c0b95fb007..22b099076223 100644 --- a/trunk/sound/soc/soc-cache.c +++ b/trunk/sound/soc/soc-cache.c @@ -661,6 +661,8 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec) rbnode = rb_entry(node, struct snd_soc_rbtree_node, node); if (rbnode->value == rbnode->defval) continue; + WARN_ON(codec->writable_register && + codec->writable_register(codec, rbnode->reg)); ret = snd_soc_cache_read(codec, rbnode->reg, &val); if (ret) return ret; @@ -921,6 +923,8 @@ static int snd_soc_lzo_cache_sync(struct snd_soc_codec *codec) lzo_blocks = codec->reg_cache; for_each_set_bit(i, lzo_blocks[0]->sync_bmp, lzo_blocks[0]->sync_bmp_nbits) { + WARN_ON(codec->writable_register && + codec->writable_register(codec, i)); ret = snd_soc_cache_read(codec, i, &val); if (ret) return ret; @@ -1179,6 +1183,8 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec) codec_drv = codec->driver; for (i = 0; i < codec_drv->reg_cache_size; ++i) { + WARN_ON(codec->writable_register && + codec->writable_register(codec, i)); ret = snd_soc_cache_read(codec, i, &val); if (ret) return ret;