diff options
| author |   Arika Chen <arika.chen@huawei.com> | 2016-04-06 21:02:11 -0700 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2016-04-06 21:02:11 -0700 |
| commit | d99e366fc90c9b6e6197584ecd3a185441452b0c (patch) | |
| tree | 2f07a306ea7ac8d019d6e7b99163f57008655d80 | |
| parent | net: intel: remove dead links (diff) | |
| download | linux-dev-d99e366fc90c9b6e6197584ecd3a185441452b0c.tar.xz linux-dev-d99e366fc90c9b6e6197584ecd3a185441452b0c.zip | |
Revert "igb: Fix a deadlock in igb_sriov_reinit"
This reverts commit 3eb14ea8d958 ("igb: Fix a deadlock in
igb_sriov_reinit")
It is the same as commit f468adc944ef ("igb: missing rtnl_unlock in
igb_sriov_reinit()")
There is no rtnl_lock() in igb_resume before, rtnl_unlock will cause a
deadlock.
Signed-off-by: Arika Chen <arika.chen@huawei.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index ff0476c89438..8e96c35307fb 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -7579,7 +7579,6 @@ static int igb_resume(struct device *dev) if (igb_init_interrupt_scheme(adapter, true)) { dev_err(&pdev->dev, "Unable to allocate memory for queues\n"); - rtnl_unlock(); return -ENOMEM; } |