Skip to content

Commit

Permalink
sky2: Avoid rtnl_unlock without rtnl_lock
Browse files Browse the repository at this point in the history
Make sure we always call rtnl_lock before going down the
error path in sky2_resume, which unlocks the rtnl lock.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Mike McCormack authored and David S. Miller committed Mar 13, 2010
1 parent e2577a0 commit 2a40018
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -4863,6 +4863,7 @@ static int sky2_resume(struct pci_dev *pdev)
if (!hw)
return 0;

rtnl_lock();
err = pci_set_power_state(pdev, PCI_D0);
if (err)
goto out;
Expand All @@ -4884,7 +4885,6 @@ static int sky2_resume(struct pci_dev *pdev)
sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
napi_enable(&hw->napi);

rtnl_lock();
for (i = 0; i < hw->ports; i++) {
err = sky2_reattach(hw->dev[i]);
if (err)
Expand Down

0 comments on commit 2a40018

Please sign in to comment.