leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netxen: minor suspend resume fixes

Browse Source 
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>
This commit is contained in:
Amit Kumar Salecha 2009-12-08 20:40:54 +00:00 committed by David S. Miller
parent b4de921ae6
commit bc86fcbac0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/netxen/netxen_nic_main.c
View File

@ -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;