1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index f80908f74ca9..521f5838594b 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2549,6 +2549,7 @@ fc_rport_final_delete(struct work_struct *work)
                         fc_flush_devloss(shost);
                 if (!cancel_delayed_work(&rport->dev_loss_work))
                         fc_flush_devloss(shost);
+                cancel_work_sync(&rport->scan_work);
                 spin_lock_irqsave(shost->host_lock, flags);
                 rport->flags &= ~FC_RPORT_DEVLOSS_PENDING;
         }