Commit c08ab390 authored Mar 10, 2020 by Greg Kroah-Hartman

Merge tag 'thunderbolt-fix-for-v5.6-rc6' of...

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()

parents 2c523b34 e9d0e751

drivers/thunderbolt/switch.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -954,7 +954,7 @@ static bool tb_port_is_width_supported(struct tb_port *port, int width)
		ret = tb_port_read(port, &phy, TB_CFG_PORT,
		port->cap_phy + LANE_ADP_CS_0, 1);
		if (ret)
		return ret;
		return false;

		widths = (phy & LANE_ADP_CS_0_SUPPORTED_WIDTH_MASK) >>
		LANE_ADP_CS_0_SUPPORTED_WIDTH_SHIFT;

Admin message