diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2020-03-23 08:04:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2020-03-23 08:04:08 +0100 |
| commit | d2e971d884e7b7e65162788b8f3b7801cd8bc137 (patch) | |
| tree | 5f95f2e0e98d4181c50301e6dfa39cc87aa1c17a /drivers/thunderbolt | |
| parent | Merge tag 'phy-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kish... (diff) | |
| parent | Linux 5.6-rc7 (diff) | |
| download | linux-d2e971d884e7b7e65162788b8f3b7801cd8bc137.tar.gz linux-d2e971d884e7b7e65162788b8f3b7801cd8bc137.tar.bz2 linux-d2e971d884e7b7e65162788b8f3b7801cd8bc137.zip | |
Merge 5.6-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/thunderbolt')
| -rw-r--r-- | drivers/thunderbolt/switch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 7d6ecc342508..a2ce99051c51 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -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; |