]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: codecs: wcd9375: Fix double free of regulator supplies
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Mon, 26 May 2025 09:47:03 +0000 (11:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:11:19 +0000 (11:11 +0100)
commit 63fe298652d4eda07d738bfcbbc59d1343a675ef upstream.

Driver gets regulator supplies in probe path with
devm_regulator_bulk_get(), so should not call regulator_bulk_free() in
error and remove paths to avoid double free.

Fixes: 216d04139a6d ("ASoC: codecs: wcd937x: Remove separate handling for vdd-buck supply")
Cc: stable@vger.kernel.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20250526-b4-b4-asoc-wcd9395-vdd-px-fixes-v1-3-0b8a2993b7d3@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/codecs/wcd937x.c

index 9c1997a42334d62602559f9b9c4bde6080648a1c..1b3ebd6fe42c92e340ebc71a6b3878b78b432385 100644 (file)
@@ -2897,10 +2897,8 @@ static int wcd937x_probe(struct platform_device *pdev)
                return dev_err_probe(dev, ret, "Failed to get supplies\n");
 
        ret = regulator_bulk_enable(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);
-       if (ret) {
-               regulator_bulk_free(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);
+       if (ret)
                return dev_err_probe(dev, ret, "Failed to enable supplies\n");
-       }
 
        wcd937x_dt_parse_micbias_info(dev, wcd937x);
 
@@ -2936,7 +2934,6 @@ static int wcd937x_probe(struct platform_device *pdev)
 
 err_disable_regulators:
        regulator_bulk_disable(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);
-       regulator_bulk_free(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);
 
        return ret;
 }
@@ -2953,7 +2950,6 @@ static void wcd937x_remove(struct platform_device *pdev)
        pm_runtime_dont_use_autosuspend(dev);
 
        regulator_bulk_disable(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);
-       regulator_bulk_free(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);
 }
 
 #if defined(CONFIG_OF)