Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'phy-fixes3-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
Pull phy fixes from Vinod Koul:
- fixes for Qualcomm qmp-combo driver for ordering of drm and type-c
switch registartion due to drivers might not probe defer after having
registered child devices to avoid triggering a probe deferral loop.
This fixes internal display on Lenovo ThinkPad X13s
* tag 'phy-fixes3-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
phy: qcom-qmp-combo: fix type-c switch registration
phy: qcom-qmp-combo: fix drm bridge registration
+8
-8
+8
-8
drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+8
-8
drivers/phy/qualcomm/phy-qcom-qmp-combo.c
···
3562
3562
if (ret)
3563
3563
return ret;
3564
3564
3565
-
ret = qmp_combo_typec_switch_register(qmp);
3566
-
if (ret)
3567
-
return ret;
3568
-
3569
-
ret = drm_aux_bridge_register(dev);
3570
-
if (ret)
3571
-
return ret;
3572
-
3573
3565
/* Check for legacy binding with child nodes. */
3574
3566
usb_np = of_get_child_by_name(dev->of_node, "usb3-phy");
3575
3567
if (usb_np) {
···
3578
3586
3579
3587
ret = qmp_combo_parse_dt(qmp);
3580
3588
}
3589
+
if (ret)
3590
+
goto err_node_put;
3591
+
3592
+
ret = qmp_combo_typec_switch_register(qmp);
3593
+
if (ret)
3594
+
goto err_node_put;
3595
+
3596
+
ret = drm_aux_bridge_register(dev);
3581
3597
if (ret)
3582
3598
goto err_node_put;
3583
3599