From de5fa2aa7d4e3acd3868ab7a471e3adc1c75e9ae Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Sat, 13 Mar 2010 12:24:18 -0800 Subject: [PATCH] --- yaml --- r: 188011 b: refs/heads/master c: 2a40018984c5c9647df1c18489449a3a227d9136 h: refs/heads/master i: 188009: 5aa5a1136b224a4eaf176ce347bf1b90518fc82e 188007: 4fcf620c6e1c94f9e685bd90eb45b58f4e450e9b v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d0ab9a1f1ce2..5e949fe87338 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2577a065832f2c6d108de2e027891bdb2d78924 +refs/heads/master: 2a40018984c5c9647df1c18489449a3a227d9136 diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 653bdd76ef46..d8ec4c11fd49 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/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)