Skip to content

Commit e216c49

Browse files
committed
Revert "firewire: core: disable bus management work temporarily during updating topology"
This reverts commit abe7159. The bus manager work item acquires the spin lock of fw_card again, thus no need to serialize it against fw_core_handle_bus_reset(). Link: https://lore.kernel.org/r/20250924131823.262136-3-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
1 parent a6176b7 commit e216c49

1 file changed

Lines changed: 0 additions & 8 deletions

File tree

drivers/firewire/core-topology.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -460,14 +460,8 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation,
460460
{
461461
struct fw_node *local_node;
462462

463-
might_sleep();
464-
465463
trace_bus_reset_handle(card->index, generation, node_id, bm_abdicate, self_ids, self_id_count);
466464

467-
// Disable bus management work during updating the cache of bus topology, since the work
468-
// accesses to some members of fw_card.
469-
disable_delayed_work_sync(&card->bm_work);
470-
471465
scoped_guard(spinlock, &card->lock) {
472466
// If the selfID buffer is not the immediate successor of the
473467
// previously processed one, we cannot reliably compare the
@@ -501,8 +495,6 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation,
501495
}
502496
}
503497

504-
enable_delayed_work(&card->bm_work);
505-
506498
fw_schedule_bm_work(card, 0);
507499

508500
// Just used by transaction layer.

0 commit comments

Comments
 (0)