diff options
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 | 
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)  #ifdef CONFIG_STMMAC_TIMER  	priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL); -	if (unlikely(priv->tm == NULL)) { -		pr_err("%s: ERROR: timer memory alloc failed\n", __func__); +	if (unlikely(priv->tm == NULL))  		return -ENOMEM; -	} +  	priv->tm->freq = tmrate;  	/* Test if the external timer can be actually used.  |