diff options
Diffstat (limited to 'drivers/ieee1394/eth1394.c')
-rw-r--r-- | drivers/ieee1394/eth1394.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index 08f63c8d9b25..a6c4a375125c 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c | |||
@@ -1023,7 +1023,7 @@ static int ether1394_data_handler(struct net_device *dev, int srcid, int destid, | |||
1023 | if (!ud) { | 1023 | if (!ud) { |
1024 | struct eth1394_node_ref *node; | 1024 | struct eth1394_node_ref *node; |
1025 | node = eth1394_find_node_nodeid(&priv->ip_node_list, srcid); | 1025 | node = eth1394_find_node_nodeid(&priv->ip_node_list, srcid); |
1026 | if (!node) { | 1026 | if (unlikely(!node)) { |
1027 | HPSB_PRINT(KERN_ERR, "ether1394 rx: sender nodeid " | 1027 | HPSB_PRINT(KERN_ERR, "ether1394 rx: sender nodeid " |
1028 | "lookup failure: " NODE_BUS_FMT, | 1028 | "lookup failure: " NODE_BUS_FMT, |
1029 | NODE_BUS_ARGS(priv->host, srcid)); | 1029 | NODE_BUS_ARGS(priv->host, srcid)); |
@@ -1048,7 +1048,7 @@ static int ether1394_data_handler(struct net_device *dev, int srcid, int destid, | |||
1048 | * high level network layer. */ | 1048 | * high level network layer. */ |
1049 | 1049 | ||
1050 | skb = dev_alloc_skb(len + dev->hard_header_len + 15); | 1050 | skb = dev_alloc_skb(len + dev->hard_header_len + 15); |
1051 | if (!skb) { | 1051 | if (unlikely(!skb)) { |
1052 | ETH1394_PRINT_G(KERN_ERR, "Out of memory\n"); | 1052 | ETH1394_PRINT_G(KERN_ERR, "Out of memory\n"); |
1053 | priv->stats.rx_dropped++; | 1053 | priv->stats.rx_dropped++; |
1054 | return -1; | 1054 | return -1; |
@@ -1203,7 +1203,7 @@ static int ether1394_write(struct hpsb_host *host, int srcid, int destid, | |||
1203 | struct eth1394_host_info *hi; | 1203 | struct eth1394_host_info *hi; |
1204 | 1204 | ||
1205 | hi = hpsb_get_hostinfo(ð1394_highlevel, host); | 1205 | hi = hpsb_get_hostinfo(ð1394_highlevel, host); |
1206 | if (hi == NULL) { | 1206 | if (unlikely(!hi)) { |
1207 | ETH1394_PRINT_G(KERN_ERR, "No net device at fw-host%d\n", | 1207 | ETH1394_PRINT_G(KERN_ERR, "No net device at fw-host%d\n", |
1208 | host->id); | 1208 | host->id); |
1209 | return RCODE_ADDRESS_ERROR; | 1209 | return RCODE_ADDRESS_ERROR; |
@@ -1229,7 +1229,7 @@ static void ether1394_iso(struct hpsb_iso *iso) | |||
1229 | int nready; | 1229 | int nready; |
1230 | 1230 | ||
1231 | hi = hpsb_get_hostinfo(ð1394_highlevel, iso->host); | 1231 | hi = hpsb_get_hostinfo(ð1394_highlevel, iso->host); |
1232 | if (hi == NULL) { | 1232 | if (unlikely(!hi)) { |
1233 | ETH1394_PRINT_G(KERN_ERR, "No net device at fw-host%d\n", | 1233 | ETH1394_PRINT_G(KERN_ERR, "No net device at fw-host%d\n", |
1234 | iso->host->id); | 1234 | iso->host->id); |
1235 | return; | 1235 | return; |