From 3fd2ec4885f97a45fdd19fd75eab8cee3c7cb7a7 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 7 Sep 2012 17:01:15 +0800
Subject: [PATCH] --- yaml --- r: 323319 b: refs/heads/master c:
 b8575a1143f6d57a791c946291ba4363e07e32a3 h: refs/heads/master i:   323317:
 d29931baa0c1ddeb1038b35a40807772766c7fff   323315:
 b950953ee22c0ac1b0b90c41f83636953288d293   323311:
 4a521fa48a9a27441ddde8c44991aa0462e2799c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/extcon/extcon-arizona.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ebae4eb1032e..cb461cd1b70a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22c5fb6a7dc8674424394122337c84eaf48efbdf
+refs/heads/master: b8575a1143f6d57a791c946291ba4363e07e32a3
diff --git a/trunk/drivers/extcon/extcon-arizona.c b/trunk/drivers/extcon/extcon-arizona.c
index 427a289f32a5..6c19833ed2d0 100644
--- a/trunk/drivers/extcon/extcon-arizona.c
+++ b/trunk/drivers/extcon/extcon-arizona.c
@@ -434,6 +434,11 @@ static int __devinit arizona_extcon_probe(struct platform_device *pdev)
 	regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE,
 			   ARIZONA_JD1_ENA, ARIZONA_JD1_ENA);
 
+	ret = regulator_allow_bypass(info->micvdd, true);
+	if (ret != 0)
+		dev_warn(arizona->dev, "Failed to set MICVDD to bypass: %d\n",
+			 ret);
+
 	pm_runtime_put(&pdev->dev);
 
 	return 0;