Skip to content

Commit bc2f3e4

Browse files
committed
Merge tag 'thunderbolt-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus
Mika writes: thunderbolt: Fixes for v5.12-rc7 This includes two fixes: - Fix memory leak in tb_retimer_add() - Off by one in tb_port_find_retimer() Both have been in linux-next without reported issues. * tag 'thunderbolt-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: thunderbolt: Fix off by one in tb_port_find_retimer() thunderbolt: Fix a leak in tb_retimer_add()
2 parents 363eaa3 + 08fe7ae commit bc2f3e4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/thunderbolt/retimer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static int tb_retimer_add(struct tb_port *port, u8 index, u32 auth_status)
347347
ret = tb_retimer_nvm_add(rt);
348348
if (ret) {
349349
dev_err(&rt->dev, "failed to add NVM devices: %d\n", ret);
350-
device_del(&rt->dev);
350+
device_unregister(&rt->dev);
351351
return ret;
352352
}
353353

@@ -406,7 +406,7 @@ static struct tb_retimer *tb_port_find_retimer(struct tb_port *port, u8 index)
406406
*/
407407
int tb_retimer_scan(struct tb_port *port)
408408
{
409-
u32 status[TB_MAX_RETIMER_INDEX] = {};
409+
u32 status[TB_MAX_RETIMER_INDEX + 1] = {};
410410
int ret, i, last_idx = 0;
411411

412412
if (!port->cap_usb4)

0 commit comments

Comments
 (0)