regulator: Fix rc5t583_regulator_probe error handling

PATCH Applied Axel Lin 3 participants 3 messages Apr 4, 2012 Voltage and current regulator framework

Share & tools

Axel Lin

author

2012-04-04 11:52 UTC #0 lore raw

PATCH 1/1 regulator: Fix rc5t583_regulator_probe error handling

1. regulator_register returns ERR_PTR on error, thus use IS_ERR to check the return value.
2. Fix off-by-one for unregistering the registered regulator. Current code does not unregister regs[0].rdev in clean_exit.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/regulator/rc5t583-regulator.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/regulator/rc5t583-regulator.c +2 -2

index 37732f7..cac8a2a 100644
@@ -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 @@ skip_ext_pwr_config:
 	return 0;
 
 clean_exit:
-	while (--id > 0)
+	while (--id >= 0)
 		regulator_unregister(regs[id].rdev);
 
 	return ret;

Signature · 1 line

1.7.5.4

Laxman Dewangan

Acked-by on v1 1/1

2012-04-04 12:16 UTC #1 lore raw

Quoted 7 lines · Axel Lin

1. regulator_register returns ERR_PTR on error, thus use IS_ERR to check the return value.
2. Fix off-by-one for unregistering the registered regulator. Current code does not unregister regs[0].rdev in clean_exit.
Signed-off-by Axel Lin<[email protected]>
---

Acked-by Laxman Dewangan <[email protected]>

Mark Brown

Applied

2012-04-04 21:14 UTC #2 lore raw

In reply to Axel Lin

Quoted 4 lines · Axel Lin

1. regulator_register returns ERR_PTR on error, thus use IS_ERR to check the return value.
2. Fix off-by-one for unregistering the registered regulator. Current code does not unregister regs[0].rdev in clean_exit.

Applied, thanks.