[PATCH 1/2] regulator: core: Fix a trivial typo

[PATCH 1/2] regulator: core: Fix a trivial typo

[Sachin Kamat]

Changed automaticall -> automatically.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
This series is based on topic/devm branch of regulator tree.
---
 drivers/regulator/core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index c002b62..741c84c 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3741,7 +3741,7 @@ static void devm_rdev_release(struct device *dev, void *res)
  *
  * Called by regulator drivers to register a regulator.  Returns a
  * valid pointer to struct regulator_dev on success or an ERR_PTR() on
- * error.  The regulator will automaticall be released when the device
+ * error.  The regulator will automatically be released when the device
  * is unbound.
  */
 struct regulator_dev *devm_regulator_register(struct device *dev,
-- 
1.7.9.5

[PATCH 2/2] regulator: Remove redundant NULL assignment

[Sachin Kamat]

NULL assignment corrupts the error pointer and is not
necessary.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/regulator/max77686.c |    1 -
 drivers/regulator/max77693.c |    1 -
 drivers/regulator/max8997.c  |    1 -
 3 files changed, 3 deletions(-)

diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
index de5b30e..ae001cc 100644
--- a/drivers/regulator/max77686.c
+++ b/drivers/regulator/max77686.c
@@ -483,7 +483,6 @@ static int max77686_pmic_probe(struct platform_device *pdev)
 		if (IS_ERR(max77686->rdev[i])) {
 			dev_err(&pdev->dev,
 				"regulator init failed for %d\n", i);
-			max77686->rdev[i] = NULL;
 			return PTR_ERR(max77686->rdev[i]);
 		}
 	}
diff --git a/drivers/regulator/max77693.c b/drivers/regulator/max77693.c
index 2054ae1..feb20bf 100644
--- a/drivers/regulator/max77693.c
+++ b/drivers/regulator/max77693.c
@@ -271,7 +271,6 @@ static int max77693_pmic_probe(struct platform_device *pdev)
 		if (IS_ERR(max77693_pmic->rdev[i])) {
 			dev_err(max77693_pmic->dev,
 				"Failed to initialize regulator-%d\n", id);
-			max77693_pmic->rdev[i] = NULL;
 			return PTR_ERR(max77693_pmic->rdev[i]);
 		}
 	}
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 059e8ed..bcd2488 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -1209,7 +1209,6 @@ static int max8997_pmic_probe(struct platform_device *pdev)
 		if (IS_ERR(rdev[i])) {
 			dev_err(max8997->dev, "regulator init failed for %d\n",
 					id);
-			rdev[i] = NULL;
 			return PTR_ERR(rdev[i]);
 		}
 	}
-- 
1.7.9.5

Re: [PATCH 1/2] regulator: core: Fix a trivial typo

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]

On Thu, Sep 05, 2013 at 09:22:02AM +0530, Sachin Kamat wrote:
> Changed automaticall -> automatically.

Applied both, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]