aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/stmicro
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/stmicro
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/stmicro')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 96fa2da3076..ffc7581879b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -954,10 +954,9 @@ static int stmmac_open(struct net_device *dev)
954 954
955#ifdef CONFIG_STMMAC_TIMER 955#ifdef CONFIG_STMMAC_TIMER
956 priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL); 956 priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL);
957 if (unlikely(priv->tm == NULL)) { 957 if (unlikely(priv->tm == NULL))
958 pr_err("%s: ERROR: timer memory alloc failed\n", __func__);
959 return -ENOMEM; 958 return -ENOMEM;
960 } 959
961 priv->tm->freq = tmrate; 960 priv->tm->freq = tmrate;
962 961
963 /* Test if the external timer can be actually used. 962 /* Test if the external timer can be actually used.