X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=drivers%2Fthunderbolt%2Fswitch.c;h=bd5815f8f23bd61a92fd45b8e263e4b8acb067f5;hb=5e8a5e895a20c08acc49736c3ce0898be4c77c91;hp=43171cc1cc2d83c223bef20dad7a18fd22841c0e;hpb=a48fa7efaf1161c1c898931fe4c7f0070964233a;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 43171cc..bd5815f 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -2725,6 +2725,13 @@ int tb_switch_lane_bonding_enable(struct tb_switch *sw)
 	    !tb_port_is_width_supported(down, TB_LINK_WIDTH_DUAL))
 		return 0;
 
+	/*
+	 * Both lanes need to be in CL0. Here we assume lane 0 already be in
+	 * CL0 and check just for lane 1.
+	 */
+	if (tb_wait_for_port(down->dual_link_port, false) <= 0)
+		return -ENOTCONN;
+
 	ret = tb_port_lane_bonding_enable(up);
 	if (ret) {
 		tb_port_warn(up, "failed to enable lane bonding\n");