aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorXander Huff <xander.huff@ni.com>2016-08-22 15:57:16 -0500
committerDavid S. Miller <davem@davemloft.net>2016-08-23 16:56:54 -0700
commitf64f14820e2deb5db056a05d7672ee2b1c6290e5 (patch)
treeaa47abd2777ad8a0c382c16b77780011493bfe28 /drivers
parenttcp: properly scale window in tcp_v[46]_reqsk_send_ack() (diff)
downloadlinux-dev-f64f14820e2deb5db056a05d7672ee2b1c6290e5.tar.xz
linux-dev-f64f14820e2deb5db056a05d7672ee2b1c6290e5.zip
phy: micrel: Reenable interrupts during resume for ksz9031
Like the ksz8081, the ksz9031 has the behavior where it will clear the interrupt enable bits when leaving power down. This takes advantage of the solution provided by f5aba91. Signed-off-by: Xander Huff <xander.huff@ni.com> Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/phy/micrel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 053e87905b94..885ac9cbab5a 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -964,7 +964,7 @@ static struct phy_driver ksphy_driver[] = {
.get_strings = kszphy_get_strings,
.get_stats = kszphy_get_stats,
.suspend = genphy_suspend,
- .resume = genphy_resume,
+ .resume = kszphy_resume,
}, {
.phy_id = PHY_ID_KSZ8873MLL,
.phy_id_mask = MICREL_PHY_ID_MASK,