Commit f2ec26a3 authored Jul 15, 2013 by Linus Torvalds

regmap

Pull regmap fix from Mark Brown:
 "Fix regmap crash for async operation on busless maps

  This fixes a crash if something tries to do an asynchronous operation
  on busless maps which was introduced during the merge window"

* tag 'regmap-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: cache: bail in regmap_async_complete() for bus-less maps

parents f5f28b89 f2e055e7

drivers/base/regmap/regmap.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1853,7 +1853,7 @@ int regmap_async_complete(struct regmap *map)
	int ret;		int ret;

	/* Nothing to do with no async support */		/* Nothing to do with no async support */
	if (!map->bus->async_write)		if (!map->bus \|\| !map->bus->async_write)
	return 0;		return 0;

	trace_regmap_async_complete_start(map->dev);		trace_regmap_async_complete_start(map->dev);