Commit 210ee636 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 137e0ec0 47b412c1

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

+8 −8
Original line number Diff line number Diff line
@@ -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)