aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sunhme.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sunhme.c')
-rw-r--r--drivers/net/sunhme.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 30826eba1a53..915c5909c7a8 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -855,7 +855,7 @@ static void happy_meal_timer(unsigned long data)
855 hp->timer_ticks = 0; 855 hp->timer_ticks = 0;
856 hp->timer_state = asleep; /* foo on you */ 856 hp->timer_state = asleep; /* foo on you */
857 break; 857 break;
858 }; 858 }
859 859
860 if (restart_timer) { 860 if (restart_timer) {
861 hp->happy_timer.expires = jiffies + ((12 * HZ)/10); /* 1.2 sec. */ 861 hp->happy_timer.expires = jiffies + ((12 * HZ)/10); /* 1.2 sec. */
@@ -1488,7 +1488,7 @@ static int happy_meal_init(struct happy_meal *hp)
1488 HMD(("external, disable MII, ")); 1488 HMD(("external, disable MII, "));
1489 hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB); 1489 hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB);
1490 break; 1490 break;
1491 }; 1491 }
1492 1492
1493 if (happy_meal_tcvr_reset(hp, tregs)) 1493 if (happy_meal_tcvr_reset(hp, tregs))
1494 return -EAGAIN; 1494 return -EAGAIN;
@@ -1734,7 +1734,7 @@ static void happy_meal_set_initial_advertisement(struct happy_meal *hp)
1734 case external: 1734 case external:
1735 hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB); 1735 hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB);
1736 break; 1736 break;
1737 }; 1737 }
1738 if (happy_meal_tcvr_reset(hp, tregs)) 1738 if (happy_meal_tcvr_reset(hp, tregs))
1739 return; 1739 return;
1740 1740