summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2011-11-07 20:44:37 +0000
committerDavid S. Miller <davem@davemloft.net>2011-11-08 12:37:06 -0500
commit10953db8e1a278742ef7e64a3d1491802bcfa98b (patch)
tree1295d7e89e5699cb69a82c4be0088086c2706bc3
parent1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff)
downloadlinux-3.10-10953db8e1a278742ef7e64a3d1491802bcfa98b.tar.gz
linux-3.10-10953db8e1a278742ef7e64a3d1491802bcfa98b.tar.bz2
linux-3.10-10953db8e1a278742ef7e64a3d1491802bcfa98b.zip
r8169: increase the delay parameter of pm_schedule_suspend
The link down would occur when reseting PHY. And it would take about 2 ~ 5 seconds from link down to link up. If the delay of pm_schedule_suspend is not long enough, the device would enter runtime_suspend before link up. After link up, the device would wake up and reset PHY again. Then, you would find the driver keep in a loop of runtime_suspend and rumtime_resume. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Acked-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/realtek/r8169.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 92b45f08858..6f06aa10f0d 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1292,7 +1292,7 @@ static void __rtl8169_check_link_status(struct net_device *dev,
netif_carrier_off(dev);
netif_info(tp, ifdown, dev, "link down\n");
if (pm)
- pm_schedule_suspend(&tp->pci_dev->dev, 100);
+ pm_schedule_suspend(&tp->pci_dev->dev, 5000);
}
spin_unlock_irqrestore(&tp->lock, flags);
}