fdls_delete_tport(iport, tport);
        }
 
-       if ((fnic_fdmi_support == 1) && (iport->fabric.fdmi_pending > 0)) {
-               timer_delete_sync(&iport->fabric.fdmi_timer);
-               iport->fabric.fdmi_pending = 0;
+       if (fnic_fdmi_support == 1) {
+               if (iport->fabric.fdmi_pending > 0) {
+                       timer_delete_sync(&iport->fabric.fdmi_timer);
+                       iport->fabric.fdmi_pending = 0;
+               }
+               iport->flags &= ~FNIC_FDMI_ACTIVE;
        }
 
        FNIC_FCS_DBG(KERN_INFO, fnic->host, fnic->fnic_num,
 
 
 #define DRV_NAME               "fnic"
 #define DRV_DESCRIPTION                "Cisco FCoE HBA Driver"
-#define DRV_VERSION            "1.8.0.1"
+#define DRV_VERSION            "1.8.0.2"
 #define PFX                    DRV_NAME ": "
 #define DFX                     DRV_NAME "%d: "