From 09ecdfe13c92d8cf88de71cd8934d92361de7324 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 1 Dec 2009 21:12:27 +0000
Subject: [PATCH] --- yaml --- r: 185656 b: refs/heads/master c:
 84b6826306119dc3c41ef9d7ed6c408112f63301 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/regulator/core.c           | 7 +++++--
 trunk/include/linux/regulator/consumer.h | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 02c80dfbd9c4..ec22171db834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6faa7e0a4bb1215fb0a0093a0d426a72599e5982
+refs/heads/master: 84b6826306119dc3c41ef9d7ed6c408112f63301
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index b60a4c9f8f16..6d2ce8a05331 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1341,6 +1341,9 @@ static int _regulator_disable(struct regulator_dev *rdev)
 				       __func__, rdev_get_name(rdev));
 				return ret;
 			}
+
+			_notifier_call_chain(rdev, REGULATOR_EVENT_DISABLE,
+					     NULL);
 		}
 
 		/* decrease our supplies ref count and disable if required */
@@ -1399,8 +1402,8 @@ static int _regulator_force_disable(struct regulator_dev *rdev)
 			return ret;
 		}
 		/* notify other consumers that power has been forced off */
-		_notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE,
-			NULL);
+		_notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE |
+			REGULATOR_EVENT_DISABLE, NULL);
 	}
 
 	/* decrease our supplies ref count and disable if required */
diff --git a/trunk/include/linux/regulator/consumer.h b/trunk/include/linux/regulator/consumer.h
index 030d92255c7a..28c9fd020d39 100644
--- a/trunk/include/linux/regulator/consumer.h
+++ b/trunk/include/linux/regulator/consumer.h
@@ -89,8 +89,9 @@
  * REGULATION_OUT Regulator output is out of regulation.
  * FAIL           Regulator output has failed.
  * OVER_TEMP      Regulator over temp.
- * FORCE_DISABLE  Regulator shut down by software.
+ * FORCE_DISABLE  Regulator forcibly shut down by software.
  * VOLTAGE_CHANGE Regulator voltage changed.
+ * DISABLE        Regulator was disabled.
  *
  * NOTE: These events can be OR'ed together when passed into handler.
  */
@@ -102,6 +103,7 @@
 #define REGULATOR_EVENT_OVER_TEMP		0x10
 #define REGULATOR_EVENT_FORCE_DISABLE		0x20
 #define REGULATOR_EVENT_VOLTAGE_CHANGE		0x40
+#define REGULATOR_EVENT_DISABLE 		0x80
 
 struct regulator;