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

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

regulator: da9063: Check return value of devm_regmap_field_alloc calls 



Since devm_regmap_field_alloc can fail, add error checking for it.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 54129d64

drivers/regulator/da9063-regulator.c

+24 −5
Original line number Diff line number Diff line
@@ -835,21 +835,40 @@ static int da9063_regulator_probe(struct platform_device *pdev) 
		regl->desc.type = REGULATOR_VOLTAGE;

		regl->desc.owner = THIS_MODULE;



		if (regl->info->mode.reg)

		if (regl->info->mode.reg) {

			regl->mode = devm_regmap_field_alloc(&pdev->dev,

					da9063->regmap, regl->info->mode);

		if (regl->info->suspend.reg)

			if (IS_ERR(regl->mode))

				return PTR_ERR(regl->mode);

		}



		if (regl->info->suspend.reg) {

			regl->suspend = devm_regmap_field_alloc(&pdev->dev,

					da9063->regmap, regl->info->suspend);

		if (regl->info->sleep.reg)

			if (IS_ERR(regl->suspend))

				return PTR_ERR(regl->suspend);

		}



		if (regl->info->sleep.reg) {

			regl->sleep = devm_regmap_field_alloc(&pdev->dev,

					da9063->regmap, regl->info->sleep);

		if (regl->info->suspend_sleep.reg)

			if (IS_ERR(regl->sleep))

				return PTR_ERR(regl->sleep);

		}



		if (regl->info->suspend_sleep.reg) {

			regl->suspend_sleep = devm_regmap_field_alloc(&pdev->dev,

					da9063->regmap, regl->info->suspend_sleep);

		if (regl->info->ilimit.reg)

			if (IS_ERR(regl->suspend_sleep))

				return PTR_ERR(regl->suspend_sleep);

		}



		if (regl->info->ilimit.reg) {

			regl->ilimit = devm_regmap_field_alloc(&pdev->dev,

					da9063->regmap, regl->info->ilimit);

			if (IS_ERR(regl->ilimit))

				return PTR_ERR(regl->ilimit);

		}



		/* Register regulator */

		memset(&config, 0, sizeof(config));