---

yaml --- r: 302155 b: refs/heads/master c: a69df8a h: refs/heads/master i: 302153: 5cb2045 302151: e1a12af v: v3
git-mirror · Apr 4, 2012 · e329928 · e329928
1 parent 3bd77b6
commit e329928
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad9c5ffea8de1d989e205650bb46111b37498cf3
+refs/heads/master: a69df8a14ae7b891ee22f0e4c081f3ff65c0640f
diff --git a/trunk/drivers/regulator/rc5t583-regulator.c b/trunk/drivers/regulator/rc5t583-regulator.c
@@ -312,7 +312,7 @@ static int __devinit rc5t583_regulator_probe(struct platform_device *pdev)
 skip_ext_pwr_config:
 		rdev = regulator_register(&ri->desc, &pdev->dev,
 					reg_data, reg, NULL);
-		if (IS_ERR_OR_NULL(rdev)) {
+		if (IS_ERR(rdev)) {
 			dev_err(&pdev->dev, "Failed to register regulator %s\n",
 						ri->desc.name);
 			ret = PTR_ERR(rdev);
@@ -324,7 +324,7 @@ static int __devinit rc5t583_regulator_probe(struct platform_device *pdev)
 	return 0;
 
 clean_exit:
-	while (--id > 0)
+	while (--id >= 0)
 		regulator_unregister(regs[id].rdev);
 
 	return ret;