Skip to content

Commit

Permalink
Merge remote-tracking branch 'regmap/fix/async' into tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Mar 31, 2013
2 parents 6d66df4 + f951b65 commit af8ee69
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/base/regmap/regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit af8ee69

Please sign in to comment.