diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-15 08:35:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-15 08:35:54 -0700 |
| commit | 259a53407d9ae0c109902669c6f2f88a389dd163 (patch) | |
| tree | fb2f7f742f2a0ec5a7ece94f4e0e0e36933cbd63 /drivers/base/regmap/regmap.c | |
| parent | 93ee7a9340d64f20295aacc3fb6a22b759323280 (diff) | |
| parent | b33f9cbd67ba1a1c46879ec66467269f09cde8e5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Specify a module license
regmap: Fix bulk reads
Diffstat (limited to 'drivers/base/regmap/regmap.c')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index cf3565cae93..0eef4da1ac6 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -317,7 +317,7 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val, u8[0] |= map->bus->read_flag_mask; ret = map->bus->read(map->dev, map->work_buf, map->format.reg_bytes, - val, map->format.val_bytes); + val, val_len); if (ret != 0) return ret; |