Skip to content

Commit f2ec26a

Browse files
committed
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
2 parents f5f28b8 + f2e055e commit f2ec26a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/base/regmap/regmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1853,7 +1853,7 @@ int regmap_async_complete(struct regmap *map)
18531853
int ret;
18541854

18551855
/* Nothing to do with no async support */
1856-
if (!map->bus->async_write)
1856+
if (!map->bus || !map->bus->async_write)
18571857
return 0;
18581858

18591859
trace_regmap_async_complete_start(map->dev);

0 commit comments

Comments
 (0)