From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 23 Nov 2010 06:14:07 +0000 (+0800)
Subject: ASoC: Do not update the cache if write to hardware failed
X-Git-Tag: v2.6.37-rc4~14^2^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a479b02843c8d78ef51a64d1168592258440c97;p=thirdparty%2Fkernel%2Flinux.git

ASoC: Do not update the cache if write to hardware failed

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index ee4fb201de60c..d2c2430956730 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -78,8 +78,10 @@ static int tpa6130a2_i2c_write(int reg, u8 value)
 
 	if (data->power_state) {
 		val = i2c_smbus_write_byte_data(tpa6130a2_client, reg, value);
-		if (val < 0)
+		if (val < 0) {
 			dev_err(&tpa6130a2_client->dev, "Write failed\n");
+			return val;
+		}
 	}
 
 	/* Either powered on or off, we save the context */