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

regulator: ab3100: Fix regulator register error handling 



Ensure to unregister all regulators before return error in probe().

The regulator register order depends on the regulator ID pass to
ab3100_regulator_register() function. Thus we need to scan ab3100_regulator_desc
and find the index of successfully registered regulators, or alternatively just
call ab3100_regulators_remove() to unregister all registered regulators.

Since current code uses a static ab3100_regulators table, explicitly set
reg->rdev = NULL after regulator_unregister() call to ensure calling
ab3100_regulators_remove() in the unwind path always work.

Also move ab3100_regulators_remove() to avoid forward declaration.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8735bc2f

drivers/regulator/ab3100.c

+19 −14
Original line number Diff line number Diff line
@@ -609,6 +609,19 @@ static const u8 ab3100_reg_initvals[] = { 
	LDO_D_SETTING,

};



static int ab3100_regulators_remove(struct platform_device *pdev)

{

	int i;



	for (i = 0; i < AB3100_NUM_REGULATORS; i++) {

		struct ab3100_regulator *reg = &ab3100_regulators[i];



		regulator_unregister(reg->rdev);

		reg->rdev = NULL;

	}

	return 0;

}



static int

ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np)

{
@@ -635,9 +648,11 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np) 
			pdev, NULL, ab3100_regulator_matches[i].init_data,

			ab3100_regulator_matches[i].of_node,

			(int) ab3100_regulator_matches[i].driver_data);

		if (err)

		if (err) {

			ab3100_regulators_remove(pdev);

			return err;

		}

	}



	return 0;

}
@@ -695,22 +710,12 @@ static int ab3100_regulators_probe(struct platform_device *pdev) 


		err = ab3100_regulator_register(pdev, plfdata, NULL, NULL,

						desc->id);

		if (err)

		if (err) {

			ab3100_regulators_remove(pdev);

			return err;

		}



	return 0;

	}



static int ab3100_regulators_remove(struct platform_device *pdev)

{

	int i;



	for (i = 0; i < AB3100_NUM_REGULATORS; i++) {

		struct ab3100_regulator *reg = &ab3100_regulators[i];



		regulator_unregister(reg->rdev);

	}

	return 0;

}