Commit 27f033ba authored by Guo-Fu Tseng's avatar Guo-Fu Tseng Committed by Greg Kroah-Hartman

jme: Fix PHY power-off error

commit c8a8684d upstream.

Adding phy_on in opposition to phy_off.
Signed-off-by: default avatarGuo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6e1fc7a1
......@@ -1578,6 +1578,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)
{
......@@ -1598,10 +1608,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);
......@@ -3013,10 +3025,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment