1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 3ce56b3b2cd7..600502aa3b61 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3809,8 +3809,9 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost,
                 return;
 
         while (!blk_queue_plugged(q)) {
-                if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED))
-                                break;
+                if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED) &&
+                    !(rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT))
+                        break;
 
                 req = blk_fetch_request(q);
                 if (!req)