diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-31 18:27:38 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-31 18:27:38 -0400 |
| commit | af8ee69df3b5cf4649d65efa3aa359c73c48402a (patch) | |
| tree | 1c1c4ee5d1febcdf3bde24ac7c7e994449056b17 | |
| parent | 6d66df41098b84cba9b26772c09d90a108459c39 (diff) | |
| parent | f951b6587b94df2abb8c7a2425f7dcdb4fe647dc (diff) | |
Merge remote-tracking branch 'regmap/fix/async' into tmp
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
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, | |||
| 1035 | kfree(async->work_buf); | 1035 | kfree(async->work_buf); |
| 1036 | kfree(async); | 1036 | kfree(async); |
| 1037 | } | 1037 | } |
| 1038 | |||
| 1039 | return ret; | ||
| 1038 | } | 1040 | } |
| 1039 | 1041 | ||
| 1040 | trace_regmap_hw_write_start(map->dev, reg, | 1042 | trace_regmap_hw_write_start(map->dev, reg, |