From: Greg Kroah-Hartman Date: Mon, 15 Dec 2025 15:05:59 +0000 (+0100) Subject: drop regulator patch that broke the build X-Git-Tag: v6.12.63~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da708b18881e092a628abb68207fbef946be5099;p=thirdparty%2Fkernel%2Fstable-queue.git drop regulator patch that broke the build --- diff --git a/queue-5.10/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch b/queue-5.10/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch deleted file mode 100644 index c75d0aba60..0000000000 --- a/queue-5.10/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cceef88a371ef667292af0dccd6f534399e008c9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 Dec 2025 19:39:34 +0000 -Subject: regulator: fixed: Rely on the core freeing the enable GPIO - -From: Mark Brown - -[ Upstream commit 79a45ddcdbba330f5139c7c7ff7042d69cf147b2 ] - -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 -Closes: https://lore.kernel.org/r/DEPEYUF5BRGY.UKFBWRRE8HNP@cknow-tech.com -Tested-by: Diederik de Haas -Signed-off-by: Mark Brown -Link: https://patch.msgid.link/20251204-regulator-fixed-fix-gpiod-leak-v1-1-48efea5b82c2@kernel.org -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/regulator/fixed.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c -index 1503a5ea0cc89..acd9a75b76253 100644 ---- a/drivers/regulator/fixed.c -+++ b/drivers/regulator/fixed.c -@@ -237,13 +237,10 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) - - 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); - --- -2.51.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 5c53d47ff1..45ea5b5908 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -136,7 +136,6 @@ asoc-ak4458-disable-regulator-when-error-happens.patch asoc-ak5558-disable-regulator-when-error-happens.patch blk-mq-abort-suspend-when-wakeup-events-are-pending.patch block-fix-comment-for-op_is_zone_mgmt-to-include-res.patch -regulator-fixed-rely-on-the-core-freeing-the-enable-.patch dma-pool-eliminate-alloc_pages-warning-in-atomic_poo.patch alsa-uapi-fix-typo-in-asound.h-comment.patch arm-9464-1-fix-input-only-operand-modification-in-lo.patch diff --git a/queue-5.15/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch b/queue-5.15/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch deleted file mode 100644 index 7ed107658d..0000000000 --- a/queue-5.15/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e6b540855a9ecf18e0092298870256905cdbdd50 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 Dec 2025 19:39:34 +0000 -Subject: regulator: fixed: Rely on the core freeing the enable GPIO - -From: Mark Brown - -[ Upstream commit 79a45ddcdbba330f5139c7c7ff7042d69cf147b2 ] - -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 -Closes: https://lore.kernel.org/r/DEPEYUF5BRGY.UKFBWRRE8HNP@cknow-tech.com -Tested-by: Diederik de Haas -Signed-off-by: Mark Brown -Link: https://patch.msgid.link/20251204-regulator-fixed-fix-gpiod-leak-v1-1-48efea5b82c2@kernel.org -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/regulator/fixed.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c -index adc21b1bad94b..6702fcdc8691e 100644 ---- a/drivers/regulator/fixed.c -+++ b/drivers/regulator/fixed.c -@@ -286,13 +286,10 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) - - 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); - --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 3c56cc9d5b..8584b4c350 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -186,7 +186,6 @@ asoc-ak4458-disable-regulator-when-error-happens.patch asoc-ak5558-disable-regulator-when-error-happens.patch blk-mq-abort-suspend-when-wakeup-events-are-pending.patch block-fix-comment-for-op_is_zone_mgmt-to-include-res.patch -regulator-fixed-rely-on-the-core-freeing-the-enable-.patch dma-pool-eliminate-alloc_pages-warning-in-atomic_poo.patch alsa-uapi-fix-typo-in-asound.h-comment.patch arm-9464-1-fix-input-only-operand-modification-in-lo.patch diff --git a/queue-6.1/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch b/queue-6.1/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch deleted file mode 100644 index d820f0dcf5..0000000000 --- a/queue-6.1/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d38f207dd2e42072d7cab3e89b0228b743123337 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 Dec 2025 19:39:34 +0000 -Subject: regulator: fixed: Rely on the core freeing the enable GPIO - -From: Mark Brown - -[ Upstream commit 79a45ddcdbba330f5139c7c7ff7042d69cf147b2 ] - -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 -Closes: https://lore.kernel.org/r/DEPEYUF5BRGY.UKFBWRRE8HNP@cknow-tech.com -Tested-by: Diederik de Haas -Signed-off-by: Mark Brown -Link: https://patch.msgid.link/20251204-regulator-fixed-fix-gpiod-leak-v1-1-48efea5b82c2@kernel.org -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/regulator/fixed.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c -index e273275e60259..40d6ec16fde9d 100644 ---- a/drivers/regulator/fixed.c -+++ b/drivers/regulator/fixed.c -@@ -283,13 +283,10 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) - - 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); - --- -2.51.0 - diff --git a/queue-6.1/series b/queue-6.1/series index ee87f58a53..6c375a42db 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -203,7 +203,6 @@ asoc-ak4458-disable-regulator-when-error-happens.patch asoc-ak5558-disable-regulator-when-error-happens.patch blk-mq-abort-suspend-when-wakeup-events-are-pending.patch block-fix-comment-for-op_is_zone_mgmt-to-include-res.patch -regulator-fixed-rely-on-the-core-freeing-the-enable-.patch alsa-firewire-motu-fix-buffer-overflow-in-hwdep-read.patch dma-pool-eliminate-alloc_pages-warning-in-atomic_poo.patch alsa-uapi-fix-typo-in-asound.h-comment.patch diff --git a/queue-6.6/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch b/queue-6.6/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch deleted file mode 100644 index d23485e1bf..0000000000 --- a/queue-6.6/regulator-fixed-rely-on-the-core-freeing-the-enable-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 261cf1d54dfabe6d1265c01918834f2ce480577c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 4 Dec 2025 19:39:34 +0000 -Subject: regulator: fixed: Rely on the core freeing the enable GPIO - -From: Mark Brown - -[ Upstream commit 79a45ddcdbba330f5139c7c7ff7042d69cf147b2 ] - -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 -Closes: https://lore.kernel.org/r/DEPEYUF5BRGY.UKFBWRRE8HNP@cknow-tech.com -Tested-by: Diederik de Haas -Signed-off-by: Mark Brown -Link: https://patch.msgid.link/20251204-regulator-fixed-fix-gpiod-leak-v1-1-48efea5b82c2@kernel.org -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/regulator/fixed.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c -index 4477bdeb9e60f..8981b29af3257 100644 ---- a/drivers/regulator/fixed.c -+++ b/drivers/regulator/fixed.c -@@ -282,13 +282,10 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) - - 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); - --- -2.51.0 - diff --git a/queue-6.6/series b/queue-6.6/series index a39c911039..c2d40d7f84 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -276,7 +276,6 @@ asoc-ak5558-disable-regulator-when-error-happens.patch blk-mq-abort-suspend-when-wakeup-events-are-pending.patch block-fix-comment-for-op_is_zone_mgmt-to-include-res.patch nvme-auth-use-kvfree-for-memory-allocated-with-kvcal.patch -regulator-fixed-rely-on-the-core-freeing-the-enable-.patch alsa-firewire-motu-fix-buffer-overflow-in-hwdep-read.patch dma-pool-eliminate-alloc_pages-warning-in-atomic_poo.patch alsa-uapi-fix-typo-in-asound.h-comment.patch