From: Linus Torvalds Date: Mon, 15 Jul 2013 22:44:58 +0000 (-0700) Subject: Merge tag 'regmap-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... X-Git-Tag: next-20130717~82^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2ec26a3d41c8a07861aed23bc8c8eb7d9445d62;hp=f5f28b894b14fb8d23b0d03d0f77e9a0ec7946b3;p=karo-tx-linux.git 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 --- diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 95920583e31e..e0d0c7d8a5c5 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);