mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 12:24:38 +00:00
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>
This commit is contained in:
parent
e2577a0658
commit
2a40018984
1 changed files with 1 additions and 1 deletions
|
@ -4863,6 +4863,7 @@ static int sky2_resume(struct pci_dev *pdev)
|
||||||
if (!hw)
|
if (!hw)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
rtnl_lock();
|
||||||
err = pci_set_power_state(pdev, PCI_D0);
|
err = pci_set_power_state(pdev, PCI_D0);
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -4884,7 +4885,6 @@ static int sky2_resume(struct pci_dev *pdev)
|
||||||
sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
|
sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
|
||||||
napi_enable(&hw->napi);
|
napi_enable(&hw->napi);
|
||||||
|
|
||||||
rtnl_lock();
|
|
||||||
for (i = 0; i < hw->ports; i++) {
|
for (i = 0; i < hw->ports; i++) {
|
||||||
err = sky2_reattach(hw->dev[i]);
|
err = sky2_reattach(hw->dev[i]);
|
||||||
if (err)
|
if (err)
|
||||||
|
|
Loading…
Reference in a new issue