From 653decca54ada94abc9295022589b165f26d0d18 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 6 Oct 2011 23:36:22 +0000 Subject: [PATCH] --- yaml --- r: 266480 b: refs/heads/master c: 06e92c33999fd66128c2256b0461455633c3d53c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/rdc/r6040.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 43aa2eff48b8..f780b98e616b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0ec7177e239ed94a398a6c70b38530ff1393cb7 +refs/heads/master: 06e92c33999fd66128c2256b0461455633c3d53c diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c index 2bbadc044784..a128c3d1c47f 100644 --- a/trunk/drivers/net/ethernet/rdc/r6040.c +++ b/trunk/drivers/net/ethernet/rdc/r6040.c @@ -470,6 +470,8 @@ static void r6040_down(struct net_device *dev) iowrite16(adrp[0], ioaddr + MID_0L); iowrite16(adrp[1], ioaddr + MID_0M); iowrite16(adrp[2], ioaddr + MID_0H); + + phy_stop(lp->phydev); } static int r6040_close(struct net_device *dev) @@ -727,6 +729,8 @@ static int r6040_up(struct net_device *dev) /* Initialize all MAC registers */ r6040_init_mac_regs(dev); + phy_start(lp->phydev); + return 0; }