From: Sasha Levin Date: Tue, 27 Dec 2022 02:31:47 +0000 (-0500) Subject: Drop mfd-qcom_rpm-fix-an-error-handling-path-in-qcom_rpm_.patch from 5.10 X-Git-Tag: v5.15.86~59 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7880198c454095a1015baafefe4d438edec41a6c;p=thirdparty%2Fkernel%2Fstable-queue.git Drop mfd-qcom_rpm-fix-an-error-handling-path-in-qcom_rpm_.patch from 5.10 --- diff --git a/queue-5.10/mfd-qcom_rpm-fix-an-error-handling-path-in-qcom_rpm_.patch b/queue-5.10/mfd-qcom_rpm-fix-an-error-handling-path-in-qcom_rpm_.patch deleted file mode 100644 index d330cb9f12c..00000000000 --- a/queue-5.10/mfd-qcom_rpm-fix-an-error-handling-path-in-qcom_rpm_.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2aef24dc72fb3711cabe064ee40403e7b69d3383 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 20 Nov 2022 18:19:01 +0100 -Subject: mfd: qcom_rpm: Fix an error handling path in qcom_rpm_probe() - -From: Christophe JAILLET - -[ Upstream commit 36579aca877a62f67ecd77eb3edefc4c86292406 ] - -If an error occurs after the clk_prepare_enable() call, a corresponding -clk_disable_unprepare() should be called. - -Simplify code and switch to devm_clk_get_enabled() to fix it. - -Fixes: 3526403353c2 ("mfd: qcom_rpm: Handle message RAM clock") -Signed-off-by: Christophe JAILLET -Signed-off-by: Lee Jones -Link: https://lore.kernel.org/r/e39752476d02605b2be46cab7115f71255ce13a8.1668949256.git.christophe.jaillet@wanadoo.fr -Signed-off-by: Sasha Levin ---- - drivers/mfd/qcom_rpm.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c -index 71bc34b74bc9..ea5eb94427c4 100644 ---- a/drivers/mfd/qcom_rpm.c -+++ b/drivers/mfd/qcom_rpm.c -@@ -547,7 +547,7 @@ static int qcom_rpm_probe(struct platform_device *pdev) - init_completion(&rpm->ack); - - /* Enable message RAM clock */ -- rpm->ramclk = devm_clk_get(&pdev->dev, "ram"); -+ rpm->ramclk = devm_clk_get_enabled(&pdev->dev, "ram"); - if (IS_ERR(rpm->ramclk)) { - ret = PTR_ERR(rpm->ramclk); - if (ret == -EPROBE_DEFER) -@@ -558,7 +558,6 @@ static int qcom_rpm_probe(struct platform_device *pdev) - */ - rpm->ramclk = NULL; - } -- clk_prepare_enable(rpm->ramclk); /* Accepts NULL */ - - irq_ack = platform_get_irq_byname(pdev, "ack"); - if (irq_ack < 0) -@@ -681,7 +680,6 @@ static int qcom_rpm_remove(struct platform_device *pdev) - struct qcom_rpm *rpm = dev_get_drvdata(&pdev->dev); - - of_platform_depopulate(&pdev->dev); -- clk_disable_unprepare(rpm->ramclk); - - return 0; - } --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 3a2487982f5..5f4951ea387 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -454,7 +454,6 @@ remoteproc-qcom_q6v5_pas-detach-power-domains-on-rem.patch remoteproc-qcom_q6v5_pas-fix-missing-of_node_put-in-.patch powerpc-eeh-drop-redundant-spinlock-initialization.patch powerpc-pseries-eeh-use-correct-api-for-error-log-si.patch -mfd-qcom_rpm-fix-an-error-handling-path-in-qcom_rpm_.patch netfilter-flowtable-really-fix-nat-ipv6-offload.patch rtc-st-lpc-add-missing-clk_disable_unprepare-in-st_r.patch rtc-pic32-move-devm_rtc_allocate_device-earlier-in-p.patch