summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/tpa6130a2.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-11-26 17:17:42 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-26 17:17:42 +0100
commit37fa84d8e647e584bf1b71bdff0330049e34f5ef (patch)
tree6575dc8f4771be4677a2810756b1be518db1eb55 /sound/soc/codecs/tpa6130a2.c
parent5a8cfb4e8ae317d283f84122ed20faa069c5e0c4 (diff)
parent25436180ee8bed6740f29d92c2030c759885c147 (diff)
Merge branch 'fix/asoc' into for-linus
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 ee4fb201de60..d2c243095673 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 */