]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Revert "igb: Fix a deadlock in igb_sriov_reinit"
authorArika Chen <arika.chen@huawei.com>
Thu, 7 Apr 2016 04:02:11 +0000 (21:02 -0700)
committerKirtikar Kashyap <kirtikar.kashyap@oracle.com>
Thu, 22 Jun 2017 21:28:30 +0000 (14:28 -0700)
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>
(cherry picked from commit d99e366fc90c9b6e6197584ecd3a185441452b0c)

Orabug: 26325580

Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
drivers/net/ethernet/intel/igb/igb_main.c

index 2c1ef48d6a38cd930a034dfa057daf58a6257900..4c37581671ac60de97ee9bba1105b354d66d62c8 100644 (file)
@@ -7572,7 +7572,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;
        }