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

af8ee69d · Mark Brown · 6d66df41 · f951b658 · af8ee69d
Commit af8ee69d authored Mar 31, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/base/regmap/regmap.c drivers/base/regmap/regmap.c +2 -0

No files found.
--- 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,