| From 7b129025a42afbc7a7f6270dcfa3eb854aae9a1e Mon Sep 17 00:00:00 2001 |
| From: Luo Jiaxing <luojiaxing@huawei.com> |
| Date: Thu, 24 Oct 2019 22:08:24 +0800 |
| Subject: [PATCH] scsi: hisi_sas: Delete the debugfs folder of hisi_sas when |
| the probe fails |
| |
| commit cabe7c10c97a0857a9fb14b6c772ab784947995d upstream. |
| |
| Although if the debugfs initialization fails, we will delete the debugfs |
| folder of hisi_sas, but we did not consider the scenario where debugfs was |
| successfully initialized, but the probe failed for other reasons. We found |
| out that hisi_sas folder is still remain after the probe failed. |
| |
| When probe fail, we should delete debugfs folder to avoid the above issue. |
| |
| Link: https://lore.kernel.org/r/1571926105-74636-18-git-send-email-john.garry@huawei.com |
| Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com> |
| Signed-off-by: John Garry <john.garry@huawei.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c |
| index 04c00978b54a..a21bd4f7a4a5 100644 |
| --- a/drivers/scsi/hisi_sas/hisi_sas_main.c |
| +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c |
| @@ -2710,6 +2710,7 @@ int hisi_sas_probe(struct platform_device *pdev, |
| err_out_register_ha: |
| scsi_remove_host(shost); |
| err_out_ha: |
| + hisi_sas_debugfs_exit(hisi_hba); |
| hisi_sas_free(hisi_hba); |
| scsi_host_put(shost); |
| return rc; |
| diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c |
| index 0efd55baacd3..78004bc86158 100644 |
| --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c |
| +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c |
| @@ -3106,6 +3106,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) |
| err_out_register_ha: |
| scsi_remove_host(shost); |
| err_out_ha: |
| + hisi_sas_debugfs_exit(hisi_hba); |
| scsi_host_put(shost); |
| err_out_regions: |
| pci_release_regions(pdev); |
| -- |
| 2.7.4 |
| |
