summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-15 15:44:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-15 15:44:58 -0700
commitf2ec26a3d41c8a07861aed23bc8c8eb7d9445d62 (patch)
tree3bbc9892ea07df7f3ae8358e7fa11b280bc98b77 /drivers/base
parentf5f28b894b14fb8d23b0d03d0f77e9a0ec7946b3 (diff)
parentf2e055e7c9c6084bfbaa68701e52562acf96419e (diff)
downloadop-kernel-dev-f2ec26a3d41c8a07861aed23bc8c8eb7d9445d62.zip
op-kernel-dev-f2ec26a3d41c8a07861aed23bc8c8eb7d9445d62.tar.gz
Merge tag 'regmap-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/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
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 95920583..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);
OpenPOWER on IntegriCloud