From e84fed99c143b21ba136ea89c905d24b4bdad05c Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 13 Feb 2013 09:31:31 +0800
Subject: [PATCH] --- yaml --- r: 350460 b: refs/heads/master c:
 e81d7bc89c9623ea000890fb4cdf7e731dc21f71 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/regulator/s5m8767.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 832d306aa879..5ba460110996 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb0ed495ca165a94d66610adf64961f2117ec36
+refs/heads/master: e81d7bc89c9623ea000890fb4cdf7e731dc21f71
diff --git a/trunk/drivers/regulator/s5m8767.c b/trunk/drivers/regulator/s5m8767.c
index ef0532d56d43..8a831947c351 100644
--- a/trunk/drivers/regulator/s5m8767.c
+++ b/trunk/drivers/regulator/s5m8767.c
@@ -659,17 +659,17 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
 	struct s5m8767_info *s5m8767;
 	int i, ret, size, buck_init;
 
+	if (!pdata) {
+		dev_err(pdev->dev.parent, "Platform data not supplied\n");
+		return -ENODEV;
+	}
+
 	if (iodev->dev->of_node) {
 		ret = s5m8767_pmic_dt_parse_pdata(pdev, pdata);
 		if (ret)
 			return ret;
 	}
 
-	if (!pdata) {
-		dev_err(pdev->dev.parent, "Platform data not supplied\n");
-		return -ENODEV;
-	}
-
 	if (pdata->buck2_gpiodvs) {
 		if (pdata->buck3_gpiodvs || pdata->buck4_gpiodvs) {
 			dev_err(&pdev->dev, "S5M8767 GPIO DVS NOT VALID\n");