Merge tag 'regmap-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

f2ec26a3 · Linus Torvalds <[email protected]> · 2013-07-15 15:44:58 -07:00

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

Commit: f2ec26a3d41c8a07861aed23bc8c8eb7d9445d62
Parents: f5f28b89 · f2e055e7

Merge commit. Changes below are compared with the first parent: f5f28b89.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/base/regmap/regmap.c	modified	+1	−1	View file

drivers/base/regmap/regmap.c

View file

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 9592058..e0d0c7d 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1853,7 +1853,7 @@ int regmap_async_complete(struct regmap *map)
 	int ret;
 
 	/* Nothing to do with no async support */
-	if (!map->bus->async_write)
+	if (!map->bus || !map->bus->async_write)
 		return 0;
 
 	trace_regmap_async_complete_start(map->dev);