diff options
author | Edmund Nadolski <edmund.nadolski@intel.com> | 2011-05-19 15:59:36 +0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 15:04:49 +0400 |
commit | a628d478570d71fb8751ad09b8017139c5056002 (patch) | |
tree | 109dc04c6542abc528c53826ba3834e8e4c52adc /drivers/scsi/isci/host.c | |
parent | ac0eeb4f774261d1da21a68169f7ddd4f6c082fc (diff) | |
download | linux-a628d478570d71fb8751ad09b8017139c5056002.tar.xz |
isci: convert phy sata_timeout_timer to sci_timer
Convert the sata_timeout_timer in the scic_sds_phy struct to
use a struct sci_timer
Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/host.c')
-rw-r--r-- | drivers/scsi/isci/host.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c index 468357ffc771..aa00cce37821 100644 --- a/drivers/scsi/isci/host.c +++ b/drivers/scsi/isci/host.c @@ -1366,6 +1366,12 @@ void isci_host_deinit(struct isci_host *ihost) del_timer_sync(&sci_port->timer.timer); } + /* Cancel any/all outstanding phy timers */ + for (i = 0; i < SCI_MAX_PHYS; i++) { + struct scic_sds_phy *sci_phy = &ihost->phys[i].sci; + del_timer_sync(&sci_phy->sata_timer.timer); + } + del_timer_sync(&ihost->sci.port_agent.timer.timer); isci_timer_list_destroy(ihost); |