From: Matt Carlson Date: Fri, 12 Oct 2007 02:49:11 +0000 (-0700) Subject: [TG3]: Fix APE induced regression X-Git-Tag: v2.6.24-rc1~1448^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9ce768ead83216d394175c0a0d72bc527648c7d0;p=linux-2.6-omap-h63xx.git [TG3]: Fix APE induced regression This patch fixes a bug caused by the recent APE support added for 5761 devices. Signed-off-by: Matt Carlson Signed-off-by: David S. Miller --- diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index a402b5c0189..e795c33b982 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -6985,9 +6985,10 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) break; }; - /* Write our heartbeat update interval to APE. */ - tg3_ape_write32(tp, TG3_APE_HOST_HEARTBEAT_INT_MS, - APE_HOST_HEARTBEAT_INT_DISABLE); + if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) + /* Write our heartbeat update interval to APE. */ + tg3_ape_write32(tp, TG3_APE_HOST_HEARTBEAT_INT_MS, + APE_HOST_HEARTBEAT_INT_DISABLE); tg3_write_sig_post_reset(tp, RESET_KIND_INIT);