diff --git a/[refs] b/[refs] index 50a864e66ac2..5b33d3f838ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fbe49328f7442090439addddf441fb5b3186e71 +refs/heads/master: b98ac702f49042ab0c382b839465b95a2bd0cd65 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index 3f7eab42aef1..acae2d8cd688 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/drivers/net/gianfar.c @@ -351,6 +351,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);