ASoC: soc-cache: Add error checking in the *_cache_sync functions
Ensure that we report any errors encountered during reads/writes
in the cache syncing functions.
Remove redundant newline in the source code.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 6c0589e..e5b1888 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -792,7 +792,6 @@
return NULL;
}
-
static int snd_soc_rbtree_insert(struct rb_root *root,
struct snd_soc_rbtree_node *rbnode)
{
@@ -826,14 +825,19 @@
struct rb_node *node;
struct snd_soc_rbtree_node *rbnode;
unsigned int val;
+ int ret;
rbtree_ctx = codec->reg_cache;
for (node = rb_first(&rbtree_ctx->root); node; node = rb_next(node)) {
rbnode = rb_entry(node, struct snd_soc_rbtree_node, node);
if (rbnode->value == rbnode->defval)
continue;
- snd_soc_cache_read(codec, rbnode->reg, &val);
- snd_soc_write(codec, rbnode->reg, val);
+ ret = snd_soc_cache_read(codec, rbnode->reg, &val);
+ if (ret)
+ return ret;
+ ret = snd_soc_write(codec, rbnode->reg, val);
+ if (ret)
+ return ret;
dev_dbg(codec->dev, "Synced register %#x, value = %#x\n",
rbnode->reg, val);
}
@@ -1110,11 +1114,16 @@
struct snd_soc_lzo_ctx **lzo_blocks;
unsigned int val;
int i;
+ int ret;
lzo_blocks = codec->reg_cache;
for_each_set_bit(i, lzo_blocks[0]->sync_bmp, lzo_blocks[0]->sync_bmp_nbits) {
- snd_soc_cache_read(codec, i, &val);
- snd_soc_write(codec, i, val);
+ ret = snd_soc_cache_read(codec, i, &val);
+ if (ret)
+ return ret;
+ ret = snd_soc_write(codec, i, val);
+ if (ret)
+ return ret;
dev_dbg(codec->dev, "Synced register %#x, value = %#x\n",
i, val);
}
@@ -1390,12 +1399,15 @@
static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
{
int i;
+ int ret;
struct snd_soc_codec_driver *codec_drv;
unsigned int val;
codec_drv = codec->driver;
for (i = 0; i < codec_drv->reg_cache_size; ++i) {
- snd_soc_cache_read(codec, i, &val);
+ ret = snd_soc_cache_read(codec, i, &val);
+ if (ret)
+ return ret;
if (codec_drv->reg_cache_default) {
switch (codec_drv->reg_word_size) {
case 1: {
@@ -1418,7 +1430,9 @@
BUG();
}
}
- snd_soc_write(codec, i, val);
+ ret = snd_soc_write(codec, i, val);
+ if (ret)
+ return ret;
dev_dbg(codec->dev, "Synced register %#x, value = %#x\n",
i, val);
}