aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-device.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2009-05-13 15:42:14 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2009-05-17 08:13:47 -0400
commit92368890d551794ee8d7e90477d8498bb7f82a9b (patch)
tree0c9fe72c0d770ce4ac358235fafd18803415b1ac /drivers/firewire/fw-device.c
parent32a0f488ce5e8a9a148491f15edc508ab5e8265b (diff)
firewire: core: improve check for local node
My recently added test for a device being local in fw-cdev.c got it slightly wrong: Comparisons of node IDs are only valid if the generation is current, which I forgot to check. Normally, serialization by card->lock takes care of this, but a device in FW_DEVICE_GONE state will necessarily have a wrong generation and invalid node_id. The "is it local?" check is made 100% correct and simpler now by means of a struct fw_device flag which is set at fw_device creation. Besides the fw-cdev site which was to be fixed, there is another site which can make use of the new flag, and an RFC-2734 driver will benefit from it too. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-device.c')
-rw-r--r--drivers/firewire/fw-device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index a47e2129d83d..a38a68b97b58 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -1042,6 +1042,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
1042 device->node = fw_node_get(node); 1042 device->node = fw_node_get(node);
1043 device->node_id = node->node_id; 1043 device->node_id = node->node_id;
1044 device->generation = card->generation; 1044 device->generation = card->generation;
1045 device->is_local = node == card->local_node;
1045 mutex_init(&device->client_list_mutex); 1046 mutex_init(&device->client_list_mutex);
1046 INIT_LIST_HEAD(&device->client_list); 1047 INIT_LIST_HEAD(&device->client_list);
1047 1048
@@ -1075,7 +1076,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
1075 FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) { 1076 FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) {
1076 PREPARE_DELAYED_WORK(&device->work, fw_device_refresh); 1077 PREPARE_DELAYED_WORK(&device->work, fw_device_refresh);
1077 schedule_delayed_work(&device->work, 1078 schedule_delayed_work(&device->work,
1078 node == card->local_node ? 0 : INITIAL_DELAY); 1079 device->is_local ? 0 : INITIAL_DELAY);
1079 } 1080 }
1080 break; 1081 break;
1081 1082