summaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/host.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/isci/host.c')
-rw-r--r--drivers/scsi/isci/host.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 6cd7648197e..a3269b6fa22 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -1359,6 +1359,13 @@ void isci_host_deinit(struct isci_host *ihost)
wait_for_stop(ihost);
scic_controller_reset(&ihost->sci);
+
+ /* Cancel any/all outstanding port timers */
+ for (i = 0; i < ihost->sci.logical_port_entries; i++) {
+ struct scic_sds_port *sci_port = &ihost->ports[i].sci;
+ del_timer_sync(&sci_port->timer.timer);
+ }
+
isci_timer_list_destroy(ihost);
}