Skip to content

Commit 69a026a

Browse files
jhovoldbroonie
authored andcommitted
ASoC: codecs: wcd938x: fix regulator leaks on probe errors
Make sure to disable and free the regulators on probe errors and on driver unbind. Fixes: 1657252 ("ASoC: codecs: wcd938x-sdw: add SoundWire driver") Cc: [email protected] # 5.14 Cc: Srinivas Kandagatla <[email protected]> Signed-off-by: Johan Hovold <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent da29b94 commit 69a026a

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

sound/soc/codecs/wcd938x.c

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3325,8 +3325,10 @@ static int wcd938x_populate_dt_data(struct wcd938x_priv *wcd938x, struct device
33253325
return dev_err_probe(dev, ret, "Failed to get supplies\n");
33263326

33273327
ret = regulator_bulk_enable(WCD938X_MAX_SUPPLY, wcd938x->supplies);
3328-
if (ret)
3328+
if (ret) {
3329+
regulator_bulk_free(WCD938X_MAX_SUPPLY, wcd938x->supplies);
33293330
return dev_err_probe(dev, ret, "Failed to enable supplies\n");
3331+
}
33303332

33313333
wcd938x_dt_parse_micbias_info(dev, wcd938x);
33323334

@@ -3592,13 +3594,13 @@ static int wcd938x_probe(struct platform_device *pdev)
35923594

35933595
ret = wcd938x_add_slave_components(wcd938x, dev, &match);
35943596
if (ret)
3595-
return ret;
3597+
goto err_disable_regulators;
35963598

35973599
wcd938x_reset(wcd938x);
35983600

35993601
ret = component_master_add_with_match(dev, &wcd938x_comp_ops, match);
36003602
if (ret)
3601-
return ret;
3603+
goto err_disable_regulators;
36023604

36033605
pm_runtime_set_autosuspend_delay(dev, 1000);
36043606
pm_runtime_use_autosuspend(dev);
@@ -3608,11 +3610,21 @@ static int wcd938x_probe(struct platform_device *pdev)
36083610
pm_runtime_idle(dev);
36093611

36103612
return 0;
3613+
3614+
err_disable_regulators:
3615+
regulator_bulk_disable(WCD938X_MAX_SUPPLY, wcd938x->supplies);
3616+
regulator_bulk_free(WCD938X_MAX_SUPPLY, wcd938x->supplies);
3617+
3618+
return ret;
36113619
}
36123620

36133621
static void wcd938x_remove(struct platform_device *pdev)
36143622
{
3623+
struct wcd938x_priv *wcd938x = dev_get_drvdata(&pdev->dev);
3624+
36153625
component_master_del(&pdev->dev, &wcd938x_comp_ops);
3626+
regulator_bulk_disable(WCD938X_MAX_SUPPLY, wcd938x->supplies);
3627+
regulator_bulk_free(WCD938X_MAX_SUPPLY, wcd938x->supplies);
36163628
}
36173629

36183630
#if defined(CONFIG_OF)

0 commit comments

Comments
 (0)