summaryrefslogtreecommitdiff
path: root/drivers/net/netxen
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit.salecha@qlogic.com>2009-12-08 23:40:54 +0300
committerDavid S. Miller <davem@davemloft.net>2009-12-24 01:13:26 +0300
commitbc86fcbac0a86a93ee65cc31769c4e83e6ff2295 (patch)
tree8be1785bdebded3c125af8797a4e7dd0d9d9d39a /drivers/net/netxen
parentb4de921ae6f7bb211868be4f7d56e80ac6da676c (diff)
downloadlinux-bc86fcbac0a86a93ee65cc31769c4e83e6ff2295.tar.xz
netxen: minor suspend resume fixes
o pci device should be disable at the end and it should be enable first. o Interface should be attached(netif_device_attach()) irrespective of its state. Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 6cae26a5bd67..41cb0af4b556 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1448,14 +1448,14 @@ static int __netxen_nic_shutdown(struct pci_dev *pdev)
pci_enable_wake(pdev, PCI_D3hot, 1);
}
- pci_disable_device(pdev);
-
return 0;
}
static void netxen_nic_shutdown(struct pci_dev *pdev)
{
if (__netxen_nic_shutdown(pdev))
return;
+
+ pci_disable_device(pdev);
}
#ifdef CONFIG_PM
static int
@@ -1468,6 +1468,8 @@ netxen_nic_suspend(struct pci_dev *pdev, pm_message_t state)
return retval;
pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+ pci_disable_device(pdev);
return 0;
}
@@ -1478,13 +1480,14 @@ netxen_nic_resume(struct pci_dev *pdev)
struct net_device *netdev = adapter->netdev;
int err;
- pci_set_power_state(pdev, PCI_D0);
- pci_restore_state(pdev);
-
err = pci_enable_device(pdev);
if (err)
return err;
+ pci_set_power_state(pdev, PCI_D0);
+ pci_set_master(pdev);
+ pci_restore_state(pdev);
+
adapter->ahw.crb_win = -1;
adapter->ahw.ocm_win = -1;
@@ -1503,11 +1506,10 @@ netxen_nic_resume(struct pci_dev *pdev)
if (err)
goto err_out_detach;
- netif_device_attach(netdev);
-
netxen_config_indev_addr(netdev, NETDEV_UP);
}
+ netif_device_attach(netdev);
netxen_schedule_work(adapter, netxen_fw_poll_work, FW_POLL_DELAY);
return 0;