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

Commit 3bbbcafb authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

regulator: core: fix debugfs creation regression 



commit 2a4b49bb58123bad6ec0e07b02845f74c23d5e04 upstream.

regulator_get() may sometimes be called more than once for the same
consumer device, something which before commit dbe954d8f163 ("regulator:
core: Avoid debugfs: Directory ...  already present! error") resulted in
errors being logged.

A couple of recent commits broke the handling of such cases so that
attributes are now erroneously created in the debugfs root directory the
second time a regulator is requested and the log is filled with errors
like:

	debugfs: File 'uA_load' in directory '/' already present!
	debugfs: File 'min_uV' in directory '/' already present!
	debugfs: File 'max_uV' in directory '/' already present!
	debugfs: File 'constraint_flags' in directory '/' already present!

on any further calls.

Fixes: 2715bb11cfff ("regulator: core: Fix more error checking for debugfs_create_dir()")
Fixes: 08880713ceec ("regulator: core: Streamline debugfs operations")
Cc: stable@vger.kernel.org
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20240509133304.8883-1-johan+linaro@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b0e6458

drivers/regulator/core.c

+16 −11
Original line number Diff line number Diff line
@@ -1708,11 +1708,15 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, 
		}

	}



	if (err != -EEXIST)

	if (err != -EEXIST) {

		regulator->debugfs = debugfs_create_dir(supply_name, rdev->debugfs);

	if (IS_ERR(regulator->debugfs))

		if (IS_ERR(regulator->debugfs)) {

			rdev_dbg(rdev, "Failed to create debugfs directory\n");

			regulator->debugfs = NULL;

		}

	}



	if (regulator->debugfs) {

		debugfs_create_u32("uA_load", 0444, regulator->debugfs,

				   &regulator->uA_load);

		debugfs_create_u32("min_uV", 0444, regulator->debugfs,
@@ -1721,6 +1725,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, 
				   &regulator->voltage[PM_SUSPEND_ON].max_uV);

		debugfs_create_file("constraint_flags", 0444, regulator->debugfs,

				    regulator, &constraint_flags_fops);

	}



	/*

	 * Check now if the regulator is an always on regulator - if