64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From 7a90ffb588c34ac9fc2d0f6c5926bc3ec92edf50 Mon Sep 17 00:00:00 2001
|
|
From: Luo Jiaxing <luojiaxing@huawei.com>
|
|
Date: Thu, 24 Oct 2019 22:08:24 +0800
|
|
Subject: [PATCH 037/108] scsi: hisi_sas: Delete the debugfs folder of hisi_sas
|
|
when the probe fails
|
|
|
|
mainline inclusion
|
|
from mainline-v5.5-rc1
|
|
commit cabe7c10c97a0857a9fb14b6c772ab784947995d
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8F81L
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cabe7c10c97a0857a9fb14b6c772ab784947995d
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
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: YunYi Yang <yangyunyi2@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c | 1 +
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
index 5d890758059b..d25fbb051bd3 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
@@ -2761,6 +2761,7 @@ int hisi_sas_probe(struct platform_device *pdev,
|
|
err_out_register_ha:
|
|
scsi_remove_host(shost);
|
|
err_out:
|
|
+ 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 e55442525ae6..e83a5ad2a491 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -3665,6 +3665,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.27.0
|
|
|