diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /drivers/net/sky2.c | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | 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 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) | |||
| 4863 | if (!hw) | 4863 | if (!hw) |
| 4864 | return 0; | 4864 | return 0; |
| 4865 | 4865 | ||
| 4866 | rtnl_lock(); | ||
| 4866 | err = pci_set_power_state(pdev, PCI_D0); | 4867 | err = pci_set_power_state(pdev, PCI_D0); |
| 4867 | if (err) | 4868 | if (err) |
| 4868 | goto out; | 4869 | goto out; |
| @@ -4884,7 +4885,6 @@ static int sky2_resume(struct pci_dev *pdev) | |||
| 4884 | sky2_write32(hw, B0_IMSK, Y2_IS_BASE); | 4885 | sky2_write32(hw, B0_IMSK, Y2_IS_BASE); |
| 4885 | napi_enable(&hw->napi); | 4886 | napi_enable(&hw->napi); |
| 4886 | 4887 | ||
| 4887 | rtnl_lock(); | ||
| 4888 | for (i = 0; i < hw->ports; i++) { | 4888 | for (i = 0; i < hw->ports; i++) { |
| 4889 | err = sky2_reattach(hw->dev[i]); | 4889 | err = sky2_reattach(hw->dev[i]); |
| 4890 | if (err) | 4890 | if (err) |