xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe

Browse Source 
[ Upstream commit 9ebd62d60edcd4d9c75485e5ccd0b79581ad3c49 ]

In the error handling path, the clk_prepare_enable() function
call should be balanced by a corresponding 'clk_disable_unprepare()'
call , as already done in the remove function.

Fixes: de66b34550 ("ASoC: codecs: msm8916-wcd-analog: add MBHC support")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20220316041924.17560-1-linmq006@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Miaoqian Lin
2022-03-16 04:19:24 +00:00
committed by Greg Kroah-Hartman
parent 90ac679aa6
commit abefbf602c
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/codecs/msm8916-wcd-analog.c
View File

@@ -1221,8 +1221,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
} }
irq = platform_get_irq_byname(pdev, "mbhc_switch_int"); irq = platform_get_irq_byname(pdev, "mbhc_switch_int");
if (irq < 0) if (irq < 0) {
return irq; ret = irq;
goto err_disable_clk;
}
ret = devm_request_threaded_irq(dev, irq, NULL, ret = devm_request_threaded_irq(dev, irq, NULL,
pm8916_mbhc_switch_irq_handler, pm8916_mbhc_switch_irq_handler,
@@ -1234,8 +1236,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
if (priv->mbhc_btn_enabled) { if (priv->mbhc_btn_enabled) {
irq = platform_get_irq_byname(pdev, "mbhc_but_press_det"); irq = platform_get_irq_byname(pdev, "mbhc_but_press_det");
if (irq < 0) if (irq < 0) {
return irq; ret = irq;
goto err_disable_clk;
}
ret = devm_request_threaded_irq(dev, irq, NULL, ret = devm_request_threaded_irq(dev, irq, NULL,
mbhc_btn_press_irq_handler, mbhc_btn_press_irq_handler,
@@ -1246,8 +1250,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
dev_err(dev, "cannot request mbhc button press irq\n"); dev_err(dev, "cannot request mbhc button press irq\n");
irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det"); irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det");
if (irq < 0) if (irq < 0) {
return irq; ret = irq;
goto err_disable_clk;
}
ret = devm_request_threaded_irq(dev, irq, NULL, ret = devm_request_threaded_irq(dev, irq, NULL,
mbhc_btn_release_irq_handler, mbhc_btn_release_irq_handler,
@@ -1264,6 +1270,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
return devm_snd_soc_register_component(dev, &pm8916_wcd_analog, return devm_snd_soc_register_component(dev, &pm8916_wcd_analog,
pm8916_wcd_analog_dai, pm8916_wcd_analog_dai,
ARRAY_SIZE(pm8916_wcd_analog_dai)); ARRAY_SIZE(pm8916_wcd_analog_dai));
err_disable_clk:
clk_disable_unprepare(priv->mclk);
return ret;
} }
static int pm8916_wcd_analog_spmi_remove(struct platform_device *pdev) static int pm8916_wcd_analog_spmi_remove(struct platform_device *pdev)