Skip to content

Commit 7bec465

Browse files
committed
Merge tag 'firewire-fixes-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire fix from Takashi Sakamoto: "A single commit to resolve a regression existing in v6.11 or later. The change in 1394 OHCI driver in v6.11 kernel could cause general protection faults when rediscovering nodes in IEEE 1394 bus while holding a spin lock. Consequently, watchdog checks can report a hard lockup. Currently, this issue is observed primarily during the system resume phase when using an extra node with three ports or more is used. However, it could potentially occur in the other cases as well" * tag 'firewire-fixes-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: core: fix invalid port index for parent device
2 parents 75f8b2f + f6a6780 commit 7bec465

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/firewire/core-topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static struct fw_node *build_tree(struct fw_card *card, const u32 *sid, int self
204204
// the node->ports array where the parent node should be. Later,
205205
// when we handle the parent node, we fix up the reference.
206206
++parent_count;
207-
node->color = i;
207+
node->color = port_index;
208208
break;
209209

210210
case PHY_PACKET_SELF_ID_PORT_STATUS_CHILD:

0 commit comments

Comments
 (0)