From 2250b5950b01a05dbf21cc78aa4d615fd1d85066 Mon Sep 17 00:00:00 2001 From: Giuseppe CAVALLARO Date: Tue, 27 Jul 2010 00:09:46 +0000 Subject: [PATCH] --- yaml --- r: 203775 b: refs/heads/master c: ca09c9760101b607cd2282c45b342655e26fa683 h: refs/heads/master i: 203773: 5fe0e594b97da6179ff476215672cabeb3567bd5 203771: 5d415a7eab568bef62f7ec5d17885c7a57803f64 203767: c6e257d8e41d7c8f396837b610c46d3f159d8426 203759: 003284c51b472850ab1e17a3d7fc7d3d4d94f223 203743: 11b84a537abd005224af30085ff6d48e12fe86f7 203711: f0af2da8026fac770590940f505cbb0e023c7fa7 203647: de843dbee36a4dabd2bffe2551273dd55c2caec4 203519: d7b61bed4698b3cdeec3420fd755d948ab3ffb8a 203263: 3bdc87783cdb38f1e6972ccfb736c7854ce67106 202751: 09c99c4de5de2d56b5401c971b172d8f1a869e79 v: v3 --- [refs] | 2 +- trunk/drivers/net/stmmac/stmmac_main.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 870677b157bc..09c0791cff47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49efec1eaf12d03213f1421094afb4cece109062 +refs/heads/master: ca09c9760101b607cd2282c45b342655e26fa683 diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c index 0bdd3326c94a..1083334ccd21 100644 --- a/trunk/drivers/net/stmmac/stmmac_main.c +++ b/trunk/drivers/net/stmmac/stmmac_main.c @@ -829,7 +829,6 @@ static int stmmac_open(struct net_device *dev) * In case of failure continue without timer. */ if (unlikely((stmmac_open_ext_timer(dev, priv->tm)) < 0)) { pr_warning("stmmaceth: cannot attach the external timer.\n"); - tmrate = 0; priv->tm->freq = 0; priv->tm->timer_start = stmmac_no_timer_started; priv->tm->timer_stop = stmmac_no_timer_stopped;