From e53564064b9614b0cfe381234059b588c43eae4c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 16 Apr 2013 18:35:00 -0300 Subject: [PATCH] --- yaml --- r: 369254 b: refs/heads/master c: 98d2f0e68c4de36c56fbe3baeae30c001f012243 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/atheros/atlx/atl1.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 96d92e440e52..4a88ab7aac95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 264f0ef766d6e9fcc1b4c3afd288a20ee05ef541 +refs/heads/master: 98d2f0e68c4de36c56fbe3baeae30c001f012243 diff --git a/trunk/drivers/net/ethernet/atheros/atlx/atl1.c b/trunk/drivers/net/ethernet/atheros/atlx/atl1.c index 9843c7059b6c..8338013ab33d 100644 --- a/trunk/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/trunk/drivers/net/ethernet/atheros/atlx/atl1.c @@ -2885,7 +2885,9 @@ static void atl1_shutdown(struct pci_dev *pdev) struct net_device *netdev = pci_get_drvdata(pdev); struct atl1_adapter *adapter = netdev_priv(netdev); +#ifdef CONFIG_PM_SLEEP atl1_suspend(&pdev->dev); +#endif pci_wake_from_d3(pdev, adapter->wol); pci_set_power_state(pdev, PCI_D3hot); }