--- x/drivers/nvme/target/fc.c
+++ y/drivers/nvme/target/fc.c
@@ -1273,7 +1273,14 @@ nvmet_fc_portentry_unbind(struct nvmet_f
 {
 	unsigned long flags;
 
+	if (!pe->port)
+		return;
 	spin_lock_irqsave(&nvmet_fc_tgtlock, flags);
+	if (!pe->port) {
+		spin_unlock_irqrestore(&nvmet_fc_tgtlock, flags);
+		return;
+	}
+	pe->port = NULL;
 	if (pe->tgtport) {
 		nvmet_fc_tgtport_put(pe->tgtport);
 		pe->tgtport->pe = NULL;