From: Mike McCormack <mikem@ring3k.org>
Date: Sat, 13 Mar 2010 20:24:18 +0000 (-0800)
Subject: sky2: Avoid rtnl_unlock without rtnl_lock
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a40018984c5c9647df1c18489449a3a227d9136;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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: Mike McCormack <mikem@ring3k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 653bdd76ef46..d8ec4c11fd49 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -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)