diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-25 13:17:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-25 13:17:29 +0200 |
| commit | e8d6336d9d7198013a7b307107908242a7a53b23 (patch) | |
| tree | 04567bc9b2936278a51ff2b92cdc3edacdf0e852 /drivers/thunderbolt | |
| parent | usb: dwc2: stm32mp15: set otg_rev (diff) | |
| parent | thunderbolt: Fix -Wrestrict warning (diff) | |
| download | linux-dev-e8d6336d9d7198013a7b307107908242a7a53b23.tar.xz linux-dev-e8d6336d9d7198013a7b307107908242a7a53b23.zip | |
Merge tag 'thunderbolt-for-v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next
Mika writes:
thunderbolt: Changes for v5.16 merge window
This includes following Thunderbolt/USB4 changes for the v5.16 merge
window:
* Re-enable retry logic for control packets in domain needed by some
controllers when software connection manager is being used
* Fix -Wrestrict build warning emitted by gcc-11.
Both have been in linux-next with no reported issues.
* tag 'thunderbolt-for-v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
thunderbolt: Fix -Wrestrict warning
thunderbolt: Enable retry logic for intra-domain control packets
Diffstat (limited to 'drivers/thunderbolt')
| -rw-r--r-- | drivers/thunderbolt/ctl.c | 2 | ||||
| -rw-r--r-- | drivers/thunderbolt/xdomain.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thunderbolt/ctl.c b/drivers/thunderbolt/ctl.c index 0fb5e04191e2..4986edfbdf67 100644 --- a/drivers/thunderbolt/ctl.c +++ b/drivers/thunderbolt/ctl.c @@ -17,7 +17,7 @@ #define TB_CTL_RX_PKG_COUNT 10 -#define TB_CTL_RETRIES 1 +#define TB_CTL_RETRIES 4 /** * struct tb_ctl - Thunderbolt control channel diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c index d66ea4d616fd..eff32499610f 100644 --- a/drivers/thunderbolt/xdomain.c +++ b/drivers/thunderbolt/xdomain.c @@ -730,7 +730,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, /* Full buffer size except new line and null termination */ get_modalias(svc, buf, PAGE_SIZE - 2); - return sprintf(buf, "%s\n", buf); + return strlen(strcat(buf, "\n")); } static DEVICE_ATTR_RO(modalias); |