Commit 4b44e7b1 authored Apr 11, 2014 by Linus Torvalds

regmap

Pull regmap fix from Mark Brown:
 "regmap: Fix for nodev mode

  Add mising braces so that the nodev mode actually works (which was a
  bit of an oversight)"

Testing schmesting.  We don't need not steenking testing.  We have
deadlines to beat, and new code to write.

* tag 'regmap-v3.15-nodev' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: adds missing braces in regmap_init()

parents eeb91e4f a7a037c8

drivers/base/regmap/regmap.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -761,10 +761,11 @@ struct regmap regmap_init(struct device dev,
		if (ret != 0)
		goto err_range;

		if (dev)
		if (dev) {
		ret = regmap_attach_dev(dev, map, config);
		if (ret != 0)
		goto err_regcache;
		}

		return map;