diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-21 12:08:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-21 12:08:17 -0400 |
| commit | 7f242bd889f49f5447bc4fd1eb5e437159e905b6 (patch) | |
| tree | abd4467c999558a8d2b206abe59b3de318e188a5 | |
| parent | 4ff98c9eb833e506c4426389aa7843532c265390 (diff) | |
| parent | 4e67fb5f5e336250db944921e3c68057d6203034 (diff) | |
Merge remote-tracking branch 'regmap/fix/rbtree' into regmap-linus
| -rw-r--r-- | drivers/base/regmap/regcache-rbtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index 5c1435c4e210..0fccc99881fd 100644 --- a/drivers/base/regmap/regcache-rbtree.c +++ b/drivers/base/regmap/regcache-rbtree.c | |||
| @@ -332,7 +332,7 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg) | |||
| 332 | } | 332 | } |
| 333 | 333 | ||
| 334 | if (!rbnode->blklen) { | 334 | if (!rbnode->blklen) { |
| 335 | rbnode->blklen = sizeof(*rbnode); | 335 | rbnode->blklen = 1; |
| 336 | rbnode->base_reg = reg; | 336 | rbnode->base_reg = reg; |
| 337 | } | 337 | } |
| 338 | 338 | ||