aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/net.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire/net.c')
-rw-r--r--drivers/firewire/net.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 4d565365e476..815b0fcbe918 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -356,10 +356,8 @@ static struct fwnet_fragment_info *fwnet_frag_new(
356 } 356 }
357 357
358 new = kmalloc(sizeof(*new), GFP_ATOMIC); 358 new = kmalloc(sizeof(*new), GFP_ATOMIC);
359 if (!new) { 359 if (!new)
360 dev_err(&pd->skb->dev->dev, "out of memory\n");
361 return NULL; 360 return NULL;
362 }
363 361
364 new->offset = offset; 362 new->offset = offset;
365 new->len = len; 363 new->len = len;
@@ -402,8 +400,6 @@ fail_w_fi:
402fail_w_new: 400fail_w_new:
403 kfree(new); 401 kfree(new);
404fail: 402fail:
405 dev_err(&net->dev, "out of memory\n");
406
407 return NULL; 403 return NULL;
408} 404}
409 405
@@ -609,7 +605,6 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
609 605
610 skb = dev_alloc_skb(len + LL_RESERVED_SPACE(net)); 606 skb = dev_alloc_skb(len + LL_RESERVED_SPACE(net));
611 if (unlikely(!skb)) { 607 if (unlikely(!skb)) {
612 dev_err(&net->dev, "out of memory\n");
613 net->stats.rx_dropped++; 608 net->stats.rx_dropped++;
614 609
615 return -ENOMEM; 610 return -ENOMEM;