1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c
index 3fe2f6c4a253..a114b91d606d 100644
--- a/drivers/ieee1394/ieee1394_transactions.c
+++ b/drivers/ieee1394/ieee1394_transactions.c
@@ -136,8 +136,11 @@ int hpsb_get_tlabel(struct hpsb_packet *packet)
 {
         unsigned long flags;
         struct hpsb_tlabel_pool *tp;
+        int n = NODEID_TO_NODE(packet->node_id);
 
-        tp = &packet->host->tpool[packet->node_id & NODE_MASK];
+        if (unlikely(n == ALL_NODES))
+                return 0;
+        tp = &packet->host->tpool[n];
 
         if (irqs_disabled() || in_atomic()) {
                 if (down_trylock(&tp->count))
@@ -175,8 +178,11 @@ void hpsb_free_tlabel(struct hpsb_packet *packet)
 {
         unsigned long flags;
         struct hpsb_tlabel_pool *tp;
+        int n = NODEID_TO_NODE(packet->node_id);
 
-        tp = &packet->host->tpool[packet->node_id & NODE_MASK];
+        if (unlikely(n == ALL_NODES))
+                return;
+        tp = &packet->host->tpool[n];
 
         BUG_ON(packet->tlabel > 63 || packet->tlabel < 0);