diff options
| author | Xiang Chen <chenxiang66@hisilicon.com> | 2018-03-24 00:05:10 +0800 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-04-18 19:32:51 -0400 |
| commit | 5df41af4b18720061b1024f93f54b957864cdd44 (patch) | |
| tree | 3545fb0165295bb26dbac51654b6fde8d0ab2611 /drivers/scsi/hisi_sas/hisi_sas_main.c | |
| parent | 61573630918bf29a1974e08ef5d4b8889fb9dd7f (diff) | |
| download | talos-obmc-linux-5df41af4b18720061b1024f93f54b957864cdd44.tar.gz talos-obmc-linux-5df41af4b18720061b1024f93f54b957864cdd44.zip | |
scsi: hisi_sas: delete timer when removing hisi_sas driver
Delete timer for v1 and v3 hw when removing hisi_sas driver.
Signed-off-by: Xiang chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/hisi_sas/hisi_sas_main.c')
| -rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 49c1fa643803..a21679574142 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -2177,6 +2177,9 @@ int hisi_sas_remove(struct platform_device *pdev) struct hisi_hba *hisi_hba = sha->lldd_ha; struct Scsi_Host *shost = sha->core.shost; + if (timer_pending(&hisi_hba->timer)) + del_timer(&hisi_hba->timer); + sas_unregister_ha(sha); sas_remove_host(sha->core.shost); |
