Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-02-04 16:52:41 -08:00
parent 005c79b3d4 b98ac702f4
commit 7870389478
3 changed files with 5 additions and 3 deletions
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -372,6 +372,9 @@ static int gfar_probe(struct of_device *ofdev,
 	/* Reset MAC layer */
 	gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);

+	/* We need to delay at least 3 TX clocks */
+	udelay(2);
+
 	tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
 	gfar_write(&priv->regs->maccfg1, tempval);