1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index cc1e32a7248f..17c26a1158a0 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -2169,6 +2169,13 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)
         if (err)
                 goto detach_mbx;
 
+        if (!qlcnic_83xx_read_flash_descriptor_table(adapter))
+                qlcnic_83xx_read_flash_mfg_id(adapter);
+
+        err = qlcnic_83xx_idc_init(adapter);
+        if (err)
+                goto detach_mbx;
+
         err = qlcnic_setup_intr(adapter, 0);
         if (err) {
                 dev_err(&adapter->pdev->dev, "Failed to setup interrupt\n");
@@ -2186,13 +2193,6 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)
         /* register for NIC IDC AEN Events */
         qlcnic_83xx_register_nic_idc_func(adapter, 1);
 
-        if (!qlcnic_83xx_read_flash_descriptor_table(adapter))
-                qlcnic_83xx_read_flash_mfg_id(adapter);
-
-        err = qlcnic_83xx_idc_init(adapter);
-        if (err)
-                goto disable_mbx_intr;
-
         /* Configure default, SR-IOV or Virtual NIC mode of operation */
         err = qlcnic_83xx_configure_opmode(adapter);
         if (err)