|
@@ -4724,8 +4724,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
|
|
|
|
|
|
netif_device_detach(netdev);
|
|
|
|
|
|
- mutex_lock(&adapter->mutex);
|
|
|
-
|
|
|
if (netif_running(netdev)) {
|
|
|
WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
|
|
|
e1000_down(adapter);
|
|
@@ -4733,10 +4731,8 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
retval = pci_save_state(pdev);
|
|
|
- if (retval) {
|
|
|
- mutex_unlock(&adapter->mutex);
|
|
|
+ if (retval)
|
|
|
return retval;
|
|
|
- }
|
|
|
#endif
|
|
|
|
|
|
status = er32(STATUS);
|
|
@@ -4791,8 +4787,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
|
|
|
if (netif_running(netdev))
|
|
|
e1000_free_irq(adapter);
|
|
|
|
|
|
- mutex_unlock(&adapter->mutex);
|
|
|
-
|
|
|
pci_disable_device(pdev);
|
|
|
|
|
|
return 0;
|