From 750778274b6530a729aaf806f43e6b195885f3ed Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 3 Jan 2013 21:01:47 +0800
Subject: [PATCH] --- yaml --- r: 348791 b: refs/heads/master c:
 0384618a79ccfafd05ca1538867764f7c4b7916b h: refs/heads/master i:   348789:
 eb65adb106f1411339eaebdce385a4d18e43290c   348787:
 22cad71ed193fbd8742883b3cc3792c28bf95fd2   348783:
 09bec291a068d5bcb58f46079038973f57edc6aa v: v3

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

diff --git a/[refs] b/[refs]
index 53d1e33cd67d..836332afa9e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19280e40714c9a3c55ab47f76df110072f6cde5e
+refs/heads/master: 0384618a79ccfafd05ca1538867764f7c4b7916b
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index d7448adc7a2c..278584302f2d 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -3321,7 +3321,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
  * @config: runtime configuration for regulator
  *
  * Called by regulator drivers to register a regulator.
- * Returns 0 on success.
+ * Returns a valid pointer to struct regulator_dev on success
+ * or an ERR_PTR() on error.
  */
 struct regulator_dev *
 regulator_register(const struct regulator_desc *regulator_desc,