diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-03-21 14:07:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-03-21 14:07:27 +0100 |
| commit | 9f2347842b526cbc2655068591fb0166362d2999 (patch) | |
| tree | 1d8e00f652520f1bb1036b1182920e1900a916e8 /drivers/phy/qualcomm/phy-qcom-qmp-combo.c | |
| parent | 14d811467f6592aa0e685730e66b5f9123287468 (diff) | |
| parent | 9a8b202f8cb7ebebc71f1f2a353a21c76d3063a8 (diff) | |
| download | linux-9f2347842b526cbc2655068591fb0166362d2999.tar.gz | |
Merge tag 'asoc-fix-v6.9-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.9
A bunch of fixes that came in during the merge window, probably the most
substantial thing is the DPCM locking fix for compressed audio which has
been lurking for a while.
Diffstat (limited to 'drivers/phy/qualcomm/phy-qcom-qmp-combo.c')
| -rw-r--r-- | drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 1ad10110dd254..17c4ad7553a5e 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -3562,14 +3562,6 @@ static int qmp_combo_probe(struct platform_device *pdev) if (ret) return ret; - ret = qmp_combo_typec_switch_register(qmp); - if (ret) - return ret; - - ret = drm_aux_bridge_register(dev); - if (ret) - return ret; - /* Check for legacy binding with child nodes. */ usb_np = of_get_child_by_name(dev->of_node, "usb3-phy"); if (usb_np) { @@ -3589,6 +3581,14 @@ static int qmp_combo_probe(struct platform_device *pdev) if (ret) goto err_node_put; + ret = qmp_combo_typec_switch_register(qmp); + if (ret) + goto err_node_put; + + ret = drm_aux_bridge_register(dev); + if (ret) + goto err_node_put; + pm_runtime_set_active(dev); ret = devm_pm_runtime_enable(dev); if (ret) |