1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index a2551bcd1027..ea967df4b202 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -18122,14 +18122,14 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,
 
         rtnl_lock();
 
-        /* We needn't recover from permanent error */
-        if (state == pci_channel_io_frozen)
-                tp->pcierr_recovery = true;
-
         /* We probably don't have netdev yet */
         if (!netdev || !netif_running(netdev))
                 goto done;
 
+        /* We needn't recover from permanent error */
+        if (state == pci_channel_io_frozen)
+                tp->pcierr_recovery = true;
+
         tg3_phy_stop(tp);
 
         tg3_netif_stop(tp);
@@ -18226,7 +18226,7 @@ static void tg3_io_resume(struct pci_dev *pdev)
 
         rtnl_lock();
 
-        if (!netif_running(netdev))
+        if (!netdev || !netif_running(netdev))
                 goto done;
 
         tg3_full_lock(tp, 0);