Merge branch 'for-3.1' into for-3.2

3 files changed, 9 insertions, 9 deletions

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index fdfd4881c9d1..143c705ac27b 100644
--- a/sound/soc/soc-cache.c
+++ b/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;
@@ -560,8 +560,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;
@@ -820,8 +819,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;
@@ -829,6 +826,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;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fd173f6be18d..4065d4e84ea3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1635,7 +1635,7 @@ int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
         if (codec->readable_register)
                 return codec->readable_register(codec, reg);
         else
-                return 0;
+                return 1;
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_readable_register);
 
@@ -1653,7 +1653,7 @@ int snd_soc_codec_writable_register(struct snd_soc_codec *codec,
         if (codec->writable_register)
                 return codec->writable_register(codec, reg);
         else
-                return 0;
+                return 1;
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_writable_register);
 
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 170c4ffa609f..4859ad77eac7 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2771,7 +2771,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);
 
 /**
  * snd_soc_dapm_free - free dapm resources
- * @card: SoC device
+ * @dapm: DAPM context
  *
  * Free all dapm widgets and resources.
  */