mirror of
https://github.com/torvalds/linux.git
synced 2026-10-23 15:32:04 +02:00
firewire fixes for 7.3-final
Fix a regression introduced in v6.19. It affects cancellation of the timer for split transaction timeout when handling a response. The issue is unlikely to occur in practice. -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQQE66IEYNDXNBPeGKSsLtaWM8LwEwUCatQ4OwAKCRCsLtaWM8Lw E2sNAP49Zw/nOmC9OaYKthJtKUup5Oi+4kxQnNjnDDNIraa/2gEAnhum0sbs/PHt VCRl5/WMsHPQRgNMrihFO6G+2+KACgQ= =F+OT -----END PGP SIGNATURE----- Merge tag 'firewire-fixes-7.3-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 Pull firewire fix from Takashi Sakamoto: "Fix a regression introduced in v6.19. It affects cancellation of the timer for split transaction timeout when handling a response. The issue is unlikely to occur in practice" * tag 'firewire-fixes-7.3-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: core: fix race condition in split transaction handling
This commit is contained in:
commit
a0ff06b3a7
|
|
@ -89,8 +89,12 @@ void fw_cancel_pending_transactions(struct fw_card *card)
|
|||
break; \
|
||||
} \
|
||||
} \
|
||||
if (t && try_cancel_split_timeout(t)) \
|
||||
remove_transaction_entry(card, t); \
|
||||
if (t) { \
|
||||
if (try_cancel_split_timeout(t)) \
|
||||
remove_transaction_entry(card, t); \
|
||||
else \
|
||||
t = NULL; \
|
||||
} \
|
||||
t; \
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user