summaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/host.c
diff options
context:
space:
mode:
authorEdmund Nadolski <edmund.nadolski@intel.com>2011-05-20 07:00:51 +0400
committerDan Williams <dan.j.williams@intel.com>2011-07-03 15:04:49 +0400
commitac0eeb4f774261d1da21a68169f7ddd4f6c082fc (patch)
tree28953f87b323fdc73f00642115910aab619e0150 /drivers/scsi/isci/host.c
parent5553ba2be0f3e3741e1a885a33d2b89921f9fd48 (diff)
downloadlinux-ac0eeb4f774261d1da21a68169f7ddd4f6c082fc.tar.xz
isci: convert port config agent timer to sci_timer
Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com> [squashed collateral cleanups] 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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index a3269b6fa225..468357ffc771 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -1366,6 +1366,8 @@ void isci_host_deinit(struct isci_host *ihost)
del_timer_sync(&sci_port->timer.timer);
}
+ del_timer_sync(&ihost->sci.port_agent.timer.timer);
+
isci_timer_list_destroy(ihost);
}