diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-24 10:18:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-24 10:18:37 -0800 |
| commit | bff92411eb93b2b2a06c4de76e6811486771a76f (patch) | |
| tree | 27ad7e3cce374b4b9440c36abb8c4b0659f5ada0 | |
| parent | 3f58e0945eb064777f7b77e65ae44cb4f1efc92e (diff) | |
| parent | af4ca6a8086505d135676f9c904c9d67cbb8d81b (diff) | |
| download | linux-stable-bff92411eb93b2b2a06c4de76e6811486771a76f.tar.gz linux-stable-bff92411eb93b2b2a06c4de76e6811486771a76f.tar.bz2 linux-stable-bff92411eb93b2b2a06c4de76e6811486771a76f.zip | |
Merge tag 'regmap-fix-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap fixes from Mark Brown:
"One more oversight in the debugfs code was reported and fixed, plus a
documentation fix."
* tag 'regmap-fix-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: fix small typo in regmap_bulk_write comment
regmap: debugfs: Fix seeking from the cache
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 2 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 46a213a596e2..d9a6c94ce423 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -121,8 +121,6 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map, c->max = p - 1; list_add_tail(&c->list, &map->debugfs_off_cache); - } else { - return base; } /* diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 42d5cb0f503f..f00b059c057a 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1106,7 +1106,7 @@ EXPORT_SYMBOL_GPL(regmap_raw_write); * @val_count: Number of registers to write * * This function is intended to be used for writing a large block of - * data to be device either in single transfer or multiple transfer. + * data to the device either in single transfer or multiple transfer. * * A value of zero will be returned on success, a negative errno will * be returned in error cases. |