Skip to content

Commit

Permalink
Merge tag 'regmap-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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
  • Loading branch information
Linus Torvalds committed Jul 15, 2013
2 parents f5f28b8 + f2e055e commit f2ec26a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/base/regmap/regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f2ec26a

Please sign in to comment.