summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-31 23:27:38 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-31 23:27:38 +0100
commitaf8ee69df3b5cf4649d65efa3aa359c73c48402a (patch)
tree1c1c4ee5d1febcdf3bde24ac7c7e994449056b17 /drivers/base
parent6d66df41098b84cba9b26772c09d90a108459c39 (diff)
parentf951b6587b94df2abb8c7a2425f7dcdb4fe647dc (diff)
Merge remote-tracking branch 'regmap/fix/async' into tmp
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7008f744c00d..d34adef1e63e 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1035,6 +1035,8 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg,
kfree(async->work_buf);
kfree(async);
}
+
+ return ret;
}
trace_regmap_hw_write_start(map->dev, reg,