From 391c1299ab6d95fb74734d65072d73f7a5809c5a Mon Sep 17 00:00:00 2001
From: Paul Parsons <lost.distance@yahoo.com>
Date: Thu, 20 Sep 2012 14:26:05 -0700
Subject: [PATCH] --- yaml --- r: 330490 b: refs/heads/master c:
 ec60ea5cd6c9f4b249de1580b8ebfa430055008c h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/power/pda_power.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e6ebfeedc7ed..f77a0d8d5980 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2815b786c3bb86fff97f1f6e2f0874903ff2339b
+refs/heads/master: ec60ea5cd6c9f4b249de1580b8ebfa430055008c
diff --git a/trunk/drivers/power/pda_power.c b/trunk/drivers/power/pda_power.c
index 7312f2651647..75536ebdb132 100644
--- a/trunk/drivers/power/pda_power.c
+++ b/trunk/drivers/power/pda_power.c
@@ -281,6 +281,14 @@ static int pda_power_probe(struct platform_device *pdev)
 			goto init_failed;
 	}
 
+	ac_draw = regulator_get(dev, "ac_draw");
+	if (IS_ERR(ac_draw)) {
+		dev_dbg(dev, "couldn't get ac_draw regulator\n");
+		ac_draw = NULL;
+		ret = PTR_ERR(ac_draw);
+		goto ac_draw_failed;
+	}
+
 	update_status();
 	update_charger();
 
@@ -309,13 +317,6 @@ static int pda_power_probe(struct platform_device *pdev)
 		pda_psy_usb.num_supplicants = pdata->num_supplicants;
 	}
 
-	ac_draw = regulator_get(dev, "ac_draw");
-	if (IS_ERR(ac_draw)) {
-		dev_dbg(dev, "couldn't get ac_draw regulator\n");
-		ac_draw = NULL;
-		ret = PTR_ERR(ac_draw);
-	}
-
 #ifdef CONFIG_USB_OTG_UTILS
 	transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
 	if (!IS_ERR_OR_NULL(transceiver)) {
@@ -415,6 +416,7 @@ static int pda_power_probe(struct platform_device *pdev)
 		regulator_put(ac_draw);
 		ac_draw = NULL;
 	}
+ac_draw_failed:
 	if (pdata->exit)
 		pdata->exit(dev);
 init_failed: