Merge tag 'regulator-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "One correctness fix here for the s2mps11 driver which would have
  resulted in some of the regulators being completely broken together
  with a fix for locking in regualtor_put() (which is fortunately rarely
  called at all in practical systems)"

* tag 'regulator-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: s2mps11: Fix wrong calculation of register offset
  regulator: core: fix race condition in regulator_put()

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/mfd/samsung/s2mps13.h b/include/linux/mfd/samsung/s2mps13.h
index ce5dda8958fe..b1fd675fa36f 100644
--- a/include/linux/mfd/samsung/s2mps13.h
+++ b/include/linux/mfd/samsung/s2mps13.h
@@ -59,6 +59,7 @@ enum s2mps13_reg {
         S2MPS13_REG_B6CTRL,
         S2MPS13_REG_B6OUT,
         S2MPS13_REG_B7CTRL,
+        S2MPS13_REG_B7SW,
         S2MPS13_REG_B7OUT,
         S2MPS13_REG_B8CTRL,
         S2MPS13_REG_B8OUT,
@@ -102,6 +103,7 @@ enum s2mps13_reg {
         S2MPS13_REG_L26CTRL,
         S2MPS13_REG_L27CTRL,
         S2MPS13_REG_L28CTRL,
+        S2MPS13_REG_L29CTRL,
         S2MPS13_REG_L30CTRL,
         S2MPS13_REG_L31CTRL,
         S2MPS13_REG_L32CTRL,