|
@@ -1897,13 +1897,19 @@ static int alx_resume(struct device *dev)
|
|
struct pci_dev *pdev = to_pci_dev(dev);
|
|
struct pci_dev *pdev = to_pci_dev(dev);
|
|
struct alx_priv *alx = pci_get_drvdata(pdev);
|
|
struct alx_priv *alx = pci_get_drvdata(pdev);
|
|
struct alx_hw *hw = &alx->hw;
|
|
struct alx_hw *hw = &alx->hw;
|
|
|
|
+ int err;
|
|
|
|
|
|
alx_reset_phy(hw);
|
|
alx_reset_phy(hw);
|
|
|
|
|
|
if (!netif_running(alx->dev))
|
|
if (!netif_running(alx->dev))
|
|
return 0;
|
|
return 0;
|
|
netif_device_attach(alx->dev);
|
|
netif_device_attach(alx->dev);
|
|
- return __alx_open(alx, true);
|
|
|
|
|
|
+
|
|
|
|
+ rtnl_lock();
|
|
|
|
+ err = __alx_open(alx, true);
|
|
|
|
+ rtnl_unlock();
|
|
|
|
+
|
|
|
|
+ return err;
|
|
}
|
|
}
|
|
|
|
|
|
static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
|
|
static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
|