diff options
| author | Guo-Fu Tseng <cooldavid@cooldavid.org> | 2010-10-18 16:10:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 12:52:09 +0200 |
| commit | c8a8684d5cfb0f110a962c93586630c0bf91ebc1 (patch) | |
| tree | 0569ece32522a40053b4366afbcdd3b7002082bc /drivers/net/jme.c | |
| parent | bonding: cleanup: remove braces from single block statements (diff) | |
| download | linux-c8a8684d5cfb0f110a962c93586630c0bf91ebc1.tar.xz linux-c8a8684d5cfb0f110a962c93586630c0bf91ebc1.zip | |
jme: Fix PHY power-off error
Adding phy_on in opposition to phy_off.
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Cc: <stable@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.c')
| -rw-r--r-- | drivers/net/jme.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index c04c096bc6a9..e04f180965ae 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -1574,6 +1574,16 @@ jme_free_irq(struct jme_adapter *jme) } } +static inline void +jme_phy_on(struct jme_adapter *jme) +{ + u32 bmcr; + + bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR); + bmcr &= ~BMCR_PDOWN; + jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr); +} + static int jme_open(struct net_device *netdev) { @@ -1594,10 +1604,12 @@ jme_open(struct net_device *netdev) jme_start_irq(jme); - if (test_bit(JME_FLAG_SSET, &jme->flags)) + if (test_bit(JME_FLAG_SSET, &jme->flags)) { + jme_phy_on(jme); jme_set_settings(netdev, &jme->old_ecmd); - else + } else { jme_reset_phy_processor(jme); + } jme_reset_link(jme); @@ -3005,10 +3017,12 @@ jme_resume(struct pci_dev *pdev) jme_clear_pm(jme); pci_restore_state(pdev); - if (test_bit(JME_FLAG_SSET, &jme->flags)) + if (test_bit(JME_FLAG_SSET, &jme->flags)) { + jme_phy_on(jme); jme_set_settings(netdev, &jme->old_ecmd); - else + } else { jme_reset_phy_processor(jme); + } jme_start_irq(jme); netif_device_attach(netdev); |