diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-10 09:19:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-10 09:19:33 -0700 |
| commit | 445e09e79743c8ba01f1e9eb6b10faab5a92a5c7 (patch) | |
| tree | 8913ed654a51dcd599a167ef3b88e8fc19054963 /drivers/thunderbolt/retimer.c | |
| parent | 12a0cf7241f9ee6b9b62e4c5aad53c43f46817a4 (diff) | |
| parent | bc2f3e4c662841dc19f7e7efae87782b9f3c0831 (diff) | |
| download | linux-445e09e79743c8ba01f1e9eb6b10faab5a92a5c7.tar.gz linux-445e09e79743c8ba01f1e9eb6b10faab5a92a5c7.tar.bz2 linux-445e09e79743c8ba01f1e9eb6b10faab5a92a5c7.zip | |
Merge tag 'usb-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB/Thunderbolt fixes from Greg KH:
"Here are a few small USB and Thunderbolt driver fixes for 5.12-rc7 for
reported issues:
- thunderbolt leaks and off-by-one fix
- cdnsp deque fix
- usbip fixes for syzbot-reported issues
All have been in linux-next with no reported problems"
* tag 'usb-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usbip: synchronize event handler with sysfs code paths
usbip: vudc synchronize sysfs code paths
usbip: stub-dev synchronize sysfs code paths
usbip: add sysfs_lock to synchronize sysfs code paths
thunderbolt: Fix off by one in tb_port_find_retimer()
thunderbolt: Fix a leak in tb_retimer_add()
usb: cdnsp: Fixes issue with dequeuing requests after disabling endpoint
Diffstat (limited to 'drivers/thunderbolt/retimer.c')
| -rw-r--r-- | drivers/thunderbolt/retimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thunderbolt/retimer.c b/drivers/thunderbolt/retimer.c index 620bcf586ee2..c44fad2b9fbb 100644 --- a/drivers/thunderbolt/retimer.c +++ b/drivers/thunderbolt/retimer.c @@ -347,7 +347,7 @@ static int tb_retimer_add(struct tb_port *port, u8 index, u32 auth_status) ret = tb_retimer_nvm_add(rt); if (ret) { dev_err(&rt->dev, "failed to add NVM devices: %d\n", ret); - device_del(&rt->dev); + device_unregister(&rt->dev); return ret; } @@ -406,7 +406,7 @@ static struct tb_retimer *tb_port_find_retimer(struct tb_port *port, u8 index) */ int tb_retimer_scan(struct tb_port *port) { - u32 status[TB_MAX_RETIMER_INDEX] = {}; + u32 status[TB_MAX_RETIMER_INDEX + 1] = {}; int ret, i, last_idx = 0; if (!port->cap_usb4) |