Commit 2a400189 authored by Mike McCormack's avatar Mike McCormack Committed by David S. Miller

sky2: Avoid rtnl_unlock without rtnl_lock

Make sure we always call rtnl_lock before going down the
error path in sky2_resume, which unlocks the rtnl lock.
Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2577a06
...@@ -4863,6 +4863,7 @@ static int sky2_resume(struct pci_dev *pdev) ...@@ -4863,6 +4863,7 @@ static int sky2_resume(struct pci_dev *pdev)
if (!hw) if (!hw)
return 0; return 0;
rtnl_lock();
err = pci_set_power_state(pdev, PCI_D0); err = pci_set_power_state(pdev, PCI_D0);
if (err) if (err)
goto out; goto out;
...@@ -4884,7 +4885,6 @@ static int sky2_resume(struct pci_dev *pdev) ...@@ -4884,7 +4885,6 @@ static int sky2_resume(struct pci_dev *pdev)
sky2_write32(hw, B0_IMSK, Y2_IS_BASE); sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
napi_enable(&hw->napi); napi_enable(&hw->napi);
rtnl_lock();
for (i = 0; i < hw->ports; i++) { for (i = 0; i < hw->ports; i++) {
err = sky2_reattach(hw->dev[i]); err = sky2_reattach(hw->dev[i]);
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment