From 12caa9c541f424bd016cc88cfbd13c3dc97e7586 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 28 Mar 2013 16:11:09 +0000
Subject: [PATCH] --- yaml --- r: 365055 b: refs/heads/master c:
 da0b0c47dcfd92317e2ece4c3434e1f82b55cf8a h: refs/heads/master i:   365053:
 df6b09f2a08fab621f5716070ed90c906f68c531   365051:
 5cb2ade288561358bc8e5680850283a77910638b   365047:
 7fd37c75c4e1221bba89c2504be17e7238f96094   365039:
 238eb097adbd54004752ff1ceab90e5712e58bab   365023:
 7152b0b85fa8a71571b919e9a4f2de55ab5fc7b8   364991:
 2bc8aaaa47c09af6de70b49da77796395093a732   364927:
 e52b62c74b111fd14e0b69313f671e2d5c01356b   364799:
 f421e7140d9f8462db34c806fd94306eb726a271   364543:
 0e4ad2a9b4f550caa3691e3c20af2d249b6a3d04 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/regulator/ab8500.c       | 10 ++++++++++
 trunk/include/linux/regulator/ab8500.h | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bb5a1634ad51..3b3a4646ec0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41a06aa738ad889cf96f56024ddf84ecf4a18a6f
+refs/heads/master: da0b0c47dcfd92317e2ece4c3434e1f82b55cf8a
diff --git a/trunk/drivers/regulator/ab8500.c b/trunk/drivers/regulator/ab8500.c
index 4d88a604efd1..bf34c4cd6631 100644
--- a/trunk/drivers/regulator/ab8500.c
+++ b/trunk/drivers/regulator/ab8500.c
@@ -911,6 +911,11 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
+	/* initialize debug (initial state is recorded with this call) */
+	err = ab8500_regulator_debug_init(pdev);
+	if (err)
+		return err;
+
 	/* initialize registers */
 	for (i = 0; i < pdata->num_reg_init; i++) {
 		int id, mask, value;
@@ -961,6 +966,11 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
 	if (err)
 		return err;
 
+	/* remove regulator debug */
+	err = ab8500_regulator_debug_exit(pdev);
+	if (err)
+		return err;
+
 	return 0;
 }
 
diff --git a/trunk/include/linux/regulator/ab8500.h b/trunk/include/linux/regulator/ab8500.h
index b86e089195ea..592a3f3994c0 100644
--- a/trunk/include/linux/regulator/ab8500.h
+++ b/trunk/include/linux/regulator/ab8500.h
@@ -178,4 +178,18 @@ inline int ab8500_ext_regulator_exit(struct platform_device *pdev)
 }
 #endif
 
+#ifdef CONFIG_REGULATOR_AB8500_DEBUG
+int ab8500_regulator_debug_init(struct platform_device *pdev);
+int ab8500_regulator_debug_exit(struct platform_device *pdev);
+#else
+static inline int ab8500_regulator_debug_init(struct platform_device *pdev)
+{
+	return 0;
+}
+static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
+{
+	return 0;
+}
+#endif
+
 #endif