1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index c55552c3d2f9..02b23f6277fb 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3005,6 +3005,8 @@ static int igb_sw_init(struct igb_adapter *adapter)
         /* Setup and initialize a copy of the hw vlan table array */
         adapter->shadow_vfta = kcalloc(E1000_VLAN_FILTER_TBL_SIZE, sizeof(u32),
                                        GFP_ATOMIC);
+        if (!adapter->shadow_vfta)
+                return -ENOMEM;
 
         /* This call may decrease the number of queues */
         if (igb_init_interrupt_scheme(adapter, true)) {
@@ -3172,7 +3174,7 @@ static int __igb_close(struct net_device *netdev, bool suspending)
 
 static int igb_close(struct net_device *netdev)
 {
-        if (netif_device_present(netdev))
+        if (netif_device_present(netdev) || netdev->dismantle)
                 return __igb_close(netdev, false);
         return 0;
 }