diff options
-rw-r--r-- | drivers/net/gianfar.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 2635f5bed77f..55e319fa7fe6 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -225,19 +225,7 @@ static int gfar_probe(struct platform_device *pdev) | |||
225 | 225 | ||
226 | /* Stop the DMA engine now, in case it was running before */ | 226 | /* Stop the DMA engine now, in case it was running before */ |
227 | /* (The firmware could have used it, and left it running). */ | 227 | /* (The firmware could have used it, and left it running). */ |
228 | /* To do this, we write Graceful Receive Stop and Graceful */ | 228 | gfar_halt(dev); |
229 | /* Transmit Stop, and then wait until the corresponding bits */ | ||
230 | /* in IEVENT indicate the stops have completed. */ | ||
231 | tempval = gfar_read(&priv->regs->dmactrl); | ||
232 | tempval &= ~(DMACTRL_GRS | DMACTRL_GTS); | ||
233 | gfar_write(&priv->regs->dmactrl, tempval); | ||
234 | |||
235 | tempval = gfar_read(&priv->regs->dmactrl); | ||
236 | tempval |= (DMACTRL_GRS | DMACTRL_GTS); | ||
237 | gfar_write(&priv->regs->dmactrl, tempval); | ||
238 | |||
239 | while (!(gfar_read(&priv->regs->ievent) & (IEVENT_GRSC | IEVENT_GTSC))) | ||
240 | cpu_relax(); | ||
241 | 229 | ||
242 | /* Reset MAC layer */ | 230 | /* Reset MAC layer */ |
243 | gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET); | 231 | gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET); |