diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-06-12 20:30:21 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-06-19 13:01:41 +0200 |
| commit | db3c9cc105ee844f6cd7a1beb9926fb8e9a093ae (patch) | |
| tree | 5fe981b7be4ffb97a506e23836d6c81a61dc8c91 /drivers/firewire/core-topology.c | |
| parent | e847cc832bab50aad939a0c30414cd986637564d (diff) | |
| download | lwn-db3c9cc105ee844f6cd7a1beb9926fb8e9a093ae.tar.gz lwn-db3c9cc105ee844f6cd7a1beb9926fb8e9a093ae.zip | |
firewire: replace get_features card driver hook
by feature variables in the fw_card struct. The hook appeared to be an
unnecessary abstraction in the card driver interface.
Cleaner would be to pass those feature flags as arguments to
fw_card_initialize() or fw_card_add(), but the FairnessControl register
is in the SCLK domain and may therefore not be accessible while Link
Power Status is off, i.e. before the card->driver->enable call from
fw_card_add().
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/core-topology.c')
| -rw-r--r-- | drivers/firewire/core-topology.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/firewire/core-topology.c b/drivers/firewire/core-topology.c index 00a556f3a585..3b9667c37b67 100644 --- a/drivers/firewire/core-topology.c +++ b/drivers/firewire/core-topology.c @@ -543,8 +543,7 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation, spin_lock_irqsave(&card->lock, flags); - card->broadcast_channel_allocated = (card->driver->get_features(card) & - FEATURE_CHANNEL_31_ALLOCATED) != 0; + card->broadcast_channel_allocated = card->broadcast_channel_auto_allocated; card->node_id = node_id; /* * Update node_id before generation to prevent anybody from using |