From: Mark Brown Date: Thu, 9 Jun 2011 15:22:21 +0000 (+0100) Subject: regulator: Include the device name in the microamps_requested_ file X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e0eaedefda8e14ed3f445f382c568c5d69e4223f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git regulator: Include the device name in the microamps_requested_ file We may have multiple devices requesting a supply with the same name so include the device name in the generated filename for microamps_requested to avoid duplicate files. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 75312bd6aac4..e3b67ee48b23 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1053,8 +1053,9 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, if (dev) { /* create a 'requested_microamps_name' sysfs entry */ - size = scnprintf(buf, REG_STR_SIZE, "microamps_requested_%s", - supply_name); + size = scnprintf(buf, REG_STR_SIZE, + "microamps_requested_%s-%s", + dev_name(dev), supply_name); if (size >= REG_STR_SIZE) goto overflow_err;