Commit e1e80380 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-fix-v6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fix from Mark Brown:
 "A straightforward fix from Johan for a long standing bug in cases
  where we both have regmaps without devices and something is using
  dev_get_regmap()"

* tag 'regmap-fix-v6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: fix NULL deref on lookup
parents 06dc10ea c6df8433

drivers/base/regmap/regmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1478,7 +1478,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data) 


	/* If the user didn't specify a name match any */

	if (data)

		return !strcmp((*r)->name, data);

		return (*r)->name && !strcmp((*r)->name, data);

	else

		return 1;

}