Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a69df8a1 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

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: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ad9c5ffe

drivers/regulator/rc5t583-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -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;