summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/tpa6130a2.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-23 14:30:41 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-23 14:30:41 +0000
commitd50a87402e29e16a63152be810d9723ce4d87e37 (patch)
tree968932ec54cffd983b46bfb43d571c4d0d355561 /sound/soc/codecs/tpa6130a2.c
parent5033f43c66754296dfb0ac5c895208e4a7f93aac (diff)
parent24fb2b1174ddc1f844e2008eb5b3105832860395 (diff)
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/tpa6130a2.c')
-rw-r--r--sound/soc/codecs/tpa6130a2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index bfef3da95f58..2d64502c0c5b 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -77,8 +77,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 */