[PATCH] [v2] ASoC: let snd_soc_update_bits() return an error code

[PATCH] [v2] ASoC: let snd_soc_update_bits() return an error code

[Timur Tabi]

Update snd_soc_update_bits() so that it returns a negative error code if the
the read or write operation fails.

Note that currently, a lot of the lower-level read functions have an unsigned
integer return type (and some of them even try to return a negative number),
but this code still appears to work in those cases.

An examination of the code shows that all current callers are compatible with
this change.

Signed-off-by: Timur Tabi <timur@freescale.com>
---
 sound/soc/soc-core.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a233607..bcf2f6d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2132,19 +2132,27 @@ EXPORT_SYMBOL_GPL(snd_soc_write);
  *
  * Writes new register value.
  *
- * Returns 1 for change else 0.
+ * Returns 1 for change, 0 for no change, or negative error code.
  */
 int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
 				unsigned int mask, unsigned int value)
 {
 	int change;
 	unsigned int old, new;
+	int ret;
 
-	old = snd_soc_read(codec, reg);
+	ret = snd_soc_read(codec, reg);
+	if (ret < 0)
+		return ret;
+
+	old = ret;
 	new = (old & ~mask) | value;
 	change = old != new;
-	if (change)
-		snd_soc_write(codec, reg, new);
+	if (change) {
+		ret = snd_soc_write(codec, reg, new);
+		if (ret < 0)
+			return ret;
+	}
 
 	return change;
 }
-- 
1.7.3.4

Re: [PATCH] [v2] ASoC: let snd_soc_update_bits() return an error code

[Liam Girdwood]

On Mon, 2011-01-10 at 15:58 -0600, Timur Tabi wrote:
> Update snd_soc_update_bits() so that it returns a negative error code if the
> the read or write operation fails.
> 
> Note that currently, a lot of the lower-level read functions have an unsigned
> integer return type (and some of them even try to return a negative number),
> but this code still appears to work in those cases.
> 
> An examination of the code shows that all current callers are compatible with
> this change.
> 
> Signed-off-by: Timur Tabi <timur@freescale.com>

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [PATCH] [v2] ASoC: let snd_soc_update_bits() return an error code

[Mark Brown]

On Mon, Jan 10, 2011 at 03:58:13PM -0600, Timur Tabi wrote:
> Update snd_soc_update_bits() so that it returns a negative error code if the
> the read or write operation fails.

Applied, thanks.