Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bff92411 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3f58e094 af4ca6a8

drivers/base/regmap/regmap-debugfs.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -121,8 +121,6 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map, 
		c->max = p - 1;

		c->max = p - 1;

		list_add_tail(&c->list,

		list_add_tail(&c->list,

			      &map->debugfs_off_cache);

			      &map->debugfs_off_cache);

	} else {

		return base;

	}

	}





	/*

	/*

drivers/base/regmap/regmap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1106,7 +1106,7 @@ EXPORT_SYMBOL_GPL(regmap_raw_write); 
 * @val_count: Number of registers to write

 * @val_count: Number of registers to write

 *

 *

 * This function is intended to be used for writing a large block of

 * 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

 * A value of zero will be returned on success, a negative errno will

 * be returned in error cases.

 * be returned in error cases.