From 754fb131e62c8b1850db45118b47779ee8ef3149 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 27 Aug 2011 18:24:13 +0200 Subject: [PATCH] --- yaml --- r: 263855 b: refs/heads/master c: 6c5b756aaa3e4a20c8d4b47b9dc4799b9cfdfcb8 h: refs/heads/master i: 263853: d44a01801af6a922cc7115c550b94375ae5182bf 263851: 9b9df38497bce2c2eba6ffe893c1c623d45be262 263847: f974ee2cb4dede1c26fe35cedff553eb3f8026f6 263839: eb03ccd8ac2be8267c9e646b484ca1a895307f11 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-cache.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b34fbf3a9206..09d99ee77397 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63fa0a288cfedca681175fe13cf15677e944cdb2 +refs/heads/master: 6c5b756aaa3e4a20c8d4b47b9dc4799b9cfdfcb8 diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c index d9f8aded51f3..20b7f3b003a3 100644 --- a/trunk/sound/soc/soc-cache.c +++ b/trunk/sound/soc/soc-cache.c @@ -203,14 +203,14 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec) rbnode = rb_entry(node, struct snd_soc_rbtree_node, node); for (i = 0; i < rbnode->blklen; ++i) { regtmp = rbnode->base_reg + i; - 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; + WARN_ON(!snd_soc_codec_writable_register(codec, regtmp)); + codec->cache_bypass = 1; ret = snd_soc_write(codec, regtmp, val); codec->cache_bypass = 0; @@ -563,8 +563,7 @@ 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)); + WARN_ON(!snd_soc_codec_writable_register(codec, i)); ret = snd_soc_cache_read(codec, i, &val); if (ret) return ret; @@ -823,8 +822,6 @@ 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; @@ -832,6 +829,9 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec) if (snd_soc_get_cache_val(codec->reg_def_copy, i, codec_drv->reg_word_size) == val) continue; + + WARN_ON(!snd_soc_codec_writable_register(codec, i)); + ret = snd_soc_write(codec, i, val); if (ret) return ret;