From 4970d9818eec9a0b1a1e6973675064e93afa8456 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Wed, 8 May 2013 16:09:06 +0530
Subject: [PATCH] --- yaml --- r: 376580 b: refs/heads/master c:
 3f4d6364084ca0525591836eba4a59f04bb85c68 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/regulator/core.c             |  7 ++-----
 trunk/drivers/regulator/dbx500-prcmu.c     | 24 +++++++++++-----------
 trunk/drivers/regulator/palmas-regulator.c |  2 +-
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 87be89a2d5e4..c125484ced62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a66a854f5d716bb67e24dba78e53bdd5f0253ad
+refs/heads/master: 3f4d6364084ca0525591836eba4a59f04bb85c68
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 815d6df8bd5f..6e5017841582 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1539,10 +1539,7 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev)
 }
 
 /**
- * regulator_ena_gpio_ctrl - balance enable_count of each GPIO and actual GPIO pin control
- * @rdev: regulator_dev structure
- * @enable: enable GPIO at initial use?
- *
+ * Balance enable_count of each GPIO and actual GPIO pin control.
  * GPIO is enabled in case of initial use. (enable_count is 0)
  * GPIO is disabled when it is not shared any more. (enable_count <= 1)
  */
@@ -2705,7 +2702,7 @@ EXPORT_SYMBOL_GPL(regulator_get_voltage);
 /**
  * regulator_set_current_limit - set regulator output current limit
  * @regulator: regulator source
- * @min_uA: Minimum supported current in uA
+ * @min_uA: Minimuum supported current in uA
  * @max_uA: Maximum supported current in uA
  *
  * Sets current sink to the desired output current. This can be set during
diff --git a/trunk/drivers/regulator/dbx500-prcmu.c b/trunk/drivers/regulator/dbx500-prcmu.c
index ce89f7848a57..89bd2faaef8c 100644
--- a/trunk/drivers/regulator/dbx500-prcmu.c
+++ b/trunk/drivers/regulator/dbx500-prcmu.c
@@ -24,6 +24,18 @@
 static int power_state_active_cnt; /* will initialize to zero */
 static DEFINE_SPINLOCK(power_state_active_lock);
 
+int power_state_active_get(void)
+{
+	unsigned long flags;
+	int cnt;
+
+	spin_lock_irqsave(&power_state_active_lock, flags);
+	cnt = power_state_active_cnt;
+	spin_unlock_irqrestore(&power_state_active_lock, flags);
+
+	return cnt;
+}
+
 void power_state_active_enable(void)
 {
 	unsigned long flags;
@@ -53,18 +65,6 @@ int power_state_active_disable(void)
 
 #ifdef CONFIG_REGULATOR_DEBUG
 
-static int power_state_active_get(void)
-{
-	unsigned long flags;
-	int cnt;
-
-	spin_lock_irqsave(&power_state_active_lock, flags);
-	cnt = power_state_active_cnt;
-	spin_unlock_irqrestore(&power_state_active_lock, flags);
-
-	return cnt;
-}
-
 static struct ux500_regulator_debug {
 	struct dentry *dir;
 	struct dentry *status_file;
diff --git a/trunk/drivers/regulator/palmas-regulator.c b/trunk/drivers/regulator/palmas-regulator.c
index 92ceed0fc65e..ced74167a600 100644
--- a/trunk/drivers/regulator/palmas-regulator.c
+++ b/trunk/drivers/regulator/palmas-regulator.c
@@ -840,7 +840,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
 			break;
 		}
 
-		if ((id == PALMAS_REG_SMPS6) && (id == PALMAS_REG_SMPS8))
+		if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8))
 			ramp_delay_support = true;
 
 		if (ramp_delay_support) {