diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2013-03-24 12:32:00 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2013-04-28 17:36:44 -0400 |
commit | cfb0c9d1ffbf930a4a852f178b161c522b21b0ab (patch) | |
tree | 0cc4283c327d75fd571b34d958188a9106d79a87 /drivers/firewire/net.c | |
parent | d6c8cefc69a0b1e75b369613f902141f2c621914 (diff) |
firewire: remove unnecessary alloc/OOM messages
These are redundant to log messages from the mm core.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/net.c')
-rw-r--r-- | drivers/firewire/net.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 2b27bff2591a..75c1133e437c 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c | |||
@@ -368,10 +368,8 @@ static struct fwnet_fragment_info *fwnet_frag_new( | |||
368 | } | 368 | } |
369 | 369 | ||
370 | new = kmalloc(sizeof(*new), GFP_ATOMIC); | 370 | new = kmalloc(sizeof(*new), GFP_ATOMIC); |
371 | if (!new) { | 371 | if (!new) |
372 | dev_err(&pd->skb->dev->dev, "out of memory\n"); | ||
373 | return NULL; | 372 | return NULL; |
374 | } | ||
375 | 373 | ||
376 | new->offset = offset; | 374 | new->offset = offset; |
377 | new->len = len; | 375 | new->len = len; |
@@ -414,8 +412,6 @@ fail_w_fi: | |||
414 | fail_w_new: | 412 | fail_w_new: |
415 | kfree(new); | 413 | kfree(new); |
416 | fail: | 414 | fail: |
417 | dev_err(&net->dev, "out of memory\n"); | ||
418 | |||
419 | return NULL; | 415 | return NULL; |
420 | } | 416 | } |
421 | 417 | ||
@@ -692,7 +688,6 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len, | |||
692 | 688 | ||
693 | skb = dev_alloc_skb(len + LL_RESERVED_SPACE(net)); | 689 | skb = dev_alloc_skb(len + LL_RESERVED_SPACE(net)); |
694 | if (unlikely(!skb)) { | 690 | if (unlikely(!skb)) { |
695 | dev_err(&net->dev, "out of memory\n"); | ||
696 | net->stats.rx_dropped++; | 691 | net->stats.rx_dropped++; |
697 | 692 | ||
698 | return -ENOMEM; | 693 | return -ENOMEM; |