Commit 7727da22 authored by Axel Lin's avatar Axel Lin Committed by Liam Girdwood
Browse files

regulator: Return proper error for regulator_register() 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent e36c1df8

drivers/regulator/core.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -2348,6 +2348,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, 
	if (init_data->supply_regulator && init_data->supply_regulator_dev) {

	if (init_data->supply_regulator && init_data->supply_regulator_dev) {

		dev_err(dev,

		dev_err(dev,

			"Supply regulator specified by both name and dev\n");

			"Supply regulator specified by both name and dev\n");

		ret = -EINVAL;

		goto scrub;

		goto scrub;

	}

	}
@@ -2366,6 +2367,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, 
		if (!found) {

		if (!found) {

			dev_err(dev, "Failed to find supply %s\n",

			dev_err(dev, "Failed to find supply %s\n",

				init_data->supply_regulator);

				init_data->supply_regulator);

			ret = -ENODEV;

			goto scrub;

			goto scrub;

		}

		}