* [PATCH] sky2: Avoid rtnl_unlock without rtnl_lock
@ 2010-03-12 23:11 Mike McCormack
2010-03-13 20:24 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Mike McCormack @ 2010-03-12 23:11 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
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>
---
drivers/net/sky2.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 653bdd7..d8ec4c1 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)
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sky2: Avoid rtnl_unlock without rtnl_lock
2010-03-12 23:11 [PATCH] sky2: Avoid rtnl_unlock without rtnl_lock Mike McCormack
@ 2010-03-13 20:24 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-03-13 20:24 UTC (permalink / raw)
To: mikem; +Cc: shemminger, netdev
From: Mike McCormack <mikem@ring3k.org>
Date: Sat, 13 Mar 2010 08:11:47 +0900
> 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>
Applied, thanks Mike.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-13 20:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-12 23:11 [PATCH] sky2: Avoid rtnl_unlock without rtnl_lock Mike McCormack
2010-03-13 20:24 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).