[TG3]: Fix APE induced regression
Matt Carlson [Fri, 12 Oct 2007 02:49:11 +0000 (19:49 -0700)]
This patch fixes a bug caused by the recent APE support added for 5761
devices.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/tg3.c

index a402b5c..e795c33 100644 (file)
@@ -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);