Merge remote-tracking branch 'regmap/fix/async' into tmp

2013-03-31 23:27:38 +01:00 · 2013-03-31 23:27:38 +01:00 · af8ee69df3
parent 6d66df4109 f951b6587b
commit af8ee69df3
1 changed files with 2 additions and 0 deletions
--- 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,