maple/istoreos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: regulator: fixed: Fixes a GPIO chip failure caused by an incorrect GPIO release

Browse Source 
Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
This commit is contained in:
Liangbin Lian 2026-03-18 15:29:40 +08:00
parent f277dff70f
commit a670dc3d99
2 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
target/linux/generic/hack-6.6/850-regulator-fixed-check-supply-before-request-gpio.patch Normal file
View File

@ -0,0 +1,47 @@
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -20,6 +20,7 @@
#include <linux/platform_device.h>
#include <linux/pm_domain.h>
#include <linux/pm_opp.h>
+#include <linux/regulator/consumer.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/fixed.h>
#include <linux/gpio/consumer.h>
@@ -171,6 +172,25 @@ static const struct regulator_ops fixed_
.is_enabled = reg_is_enabled,
};
+static int reg_fixed_check_input_supply(struct device *dev,
+ const char *supply_name)
+{
+ struct regulator *supply;
+
+ if (!supply_name)
+ return 0;
+
+ supply = regulator_get_optional(dev, supply_name);
+ if (IS_ERR(supply))
+ return dev_err_probe(dev, PTR_ERR(supply),
+ "input supply \"%s\" is not ready\n",
+ supply_name);
+
+ regulator_put(supply);
+
+ return 0;
+}
+
static int reg_fixed_voltage_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -198,6 +218,10 @@ static int reg_fixed_voltage_probe(struc
if (!config)
return -ENOMEM;
+ ret = reg_fixed_check_input_supply(dev, config->input_supply);
+ if (ret)
+ return ret;
+
drvdata->desc.name = devm_kstrdup(&pdev->dev,
config->supply_name,
GFP_KERNEL);

41
target/linux/generic/hack-6.6/851-v6.19-regulator-fixed-rely-on-the-core-freeing-the-enable-GPIO.patch Normal file
View File

@ -0,0 +1,41 @@
From 79a45ddcdbba330f5139c7c7ff7042d69cf147b2 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel.org>
Date: Thu, 4 Dec 2025 19:39:34 +0000
Subject: [PATCH] regulator: fixed: Rely on the core freeing the enable GPIO
In order to simplify ownership rules for enable GPIOs supplied by drivers
regulator_register() always takes ownership of them, even if it ends up
failing for some other reason. We therefore should not free the GPIO if
registration fails but just let the core worry about things.
Fixes: 636f4618b1cd (regulator: fixed: fix GPIO descriptor leak on register failure)
Reported-by: Diederik de Haas <diederik@cknow-tech.com>
Closes: https://lore.kernel.org/r/DEPEYUF5BRGY.UKFBWRRE8HNP@cknow-tech.com
Tested-by: Diederik de Haas <diederik@cknow-tech.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://patch.msgid.link/20251204-regulator-fixed-fix-gpiod-leak-v1-1-48efea5b82c2@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/regulator/fixed.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -306,13 +306,10 @@ static int reg_fixed_voltage_probe(struc
drvdata->dev = devm_regulator_register(&pdev->dev, &drvdata->desc,
&cfg);
- if (IS_ERR(drvdata->dev)) {
- ret = dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),
- "Failed to register regulator: %ld\n",
- PTR_ERR(drvdata->dev));
- gpiod_put(cfg.ena_gpiod);
- return ret;
- }
+ if (IS_ERR(drvdata->dev))
+ return dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),
+ "Failed to register regulator: %ld\n",
+ PTR_ERR(drvdata->dev));
platform_set_drvdata(pdev, drvdata);