Skip to content

Commit c08ab39

Browse files
committed
Merge tag 'thunderbolt-fix-for-v5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus
Mika writes: thunderbolt: Fix for v5.6-rc6 This includes a single commit that fixes incorrect return value from tb_port_is_width_supported() if the read fails. * tag 'thunderbolt-fix-for-v5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: thunderbolt: Fix error code in tb_port_is_width_supported()
2 parents 2c523b3 + e9d0e75 commit c08ab39

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/thunderbolt/switch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ static bool tb_port_is_width_supported(struct tb_port *port, int width)
954954
ret = tb_port_read(port, &phy, TB_CFG_PORT,
955955
port->cap_phy + LANE_ADP_CS_0, 1);
956956
if (ret)
957-
return ret;
957+
return false;
958958

959959
widths = (phy & LANE_ADP_CS_0_SUPPORTED_WIDTH_MASK) >>
960960
LANE_ADP_CS_0_SUPPORTED_WIDTH_SHIFT;

0 commit comments

Comments
 (0)