diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-07-03 11:04:27 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-07-03 11:04:27 -0700 |
| commit | 77ae174ddb84800611f5339a8bd53d49df6cd740 (patch) | |
| tree | 1d73287e061539846347bd679622116c80997d97 /drivers/scsi/scsi_transport_fc.c | |
| parent | 5616b0a46ed82eb9a093f752fc4d7bd3cc688583 (diff) | |
| parent | 8faeb529b2dabb9df691d614dda18910a43d05c9 (diff) | |
| download | blackbird-op-linux-77ae174ddb84800611f5339a8bd53d49df6cd740.tar.gz blackbird-op-linux-77ae174ddb84800611f5339a8bd53d49df6cd740.zip | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'drivers/scsi/scsi_transport_fc.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 1 |
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; } |
