Skip to contentSkip to conversation

sky2: Avoid rtnl_unlock without rtnl_lock

PATCH Applied Mike McCormack 2 participants 2 messages Mar 12, 2010 – Mar 13, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/sky2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sky2.c +1 -1
index 653bdd7..d8ec4c1 100644
@@ -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;
@@ -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)
Signature · 1 line
1.5.6.5