---

yaml --- r: 323319 b: refs/heads/master c: b8575a1 h: refs/heads/master i: 323317: d29931b 323315: b950953 323311: 4a521fa v: v3
git-mirror · Sep 10, 2012 · 3fd2ec4 · 3fd2ec4
1 parent d90e539
commit 3fd2ec4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;