aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/toshiba
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-01-29 07:56:23 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-31 16:20:21 -0500
commite404decb0fb017be80552adee894b35307b6c7b4 (patch)
tree19b2324328eb1f8cef599f9f164dc9ca6e5699c9 /drivers/net/ethernet/toshiba
parent5f3d9cb2962967d9d7e03abb4a7ca275a9a3fea5 (diff)
drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages
alloc failures use dump_stack so emitting an additional out-of-memory message is an unnecessary duplication. Remove the allocation failure messages. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/toshiba')
-rw-r--r--drivers/net/ethernet/toshiba/ps3_gelic_wireless.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index fd4ed7f8cfa1..5c14f82c4954 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -1621,10 +1621,9 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
1621 kfree(target->hwinfo); 1621 kfree(target->hwinfo);
1622 target->hwinfo = kzalloc(be16_to_cpu(scan_info->size), 1622 target->hwinfo = kzalloc(be16_to_cpu(scan_info->size),
1623 GFP_KERNEL); 1623 GFP_KERNEL);
1624 if (!target->hwinfo) { 1624 if (!target->hwinfo)
1625 pr_info("%s: kzalloc failed\n", __func__);
1626 continue; 1625 continue;
1627 } 1626
1628 /* copy hw scan info */ 1627 /* copy hw scan info */
1629 memcpy(target->hwinfo, scan_info, scan_info->size); 1628 memcpy(target->hwinfo, scan_info, scan_info->size);
1630 target->essid_len = strnlen(scan_info->essid, 1629 target->essid_len = strnlen(scan_info->essid,