Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'regmap-v3.15-nodev' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/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()

+2 -1
+2 -1
drivers/base/regmap/regmap.c
··· 761 761 if (ret != 0) 762 762 goto err_range; 763 763 764 - if (dev) 764 + if (dev) { 765 765 ret = regmap_attach_dev(dev, map, config); 766 766 if (ret != 0) 767 767 goto err_regcache; 768 + } 768 769 769 770 return map; 770 771