Unverified Commit eb0a4dfd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8537 scsi: hisi_sas: Set debugfs_dir pointer to NULL after removing debugfs 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2NRHTLJOLZE742TPNEFXDVBMFDELEOOH/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RE7B 
 
Link:https://gitee.com/openeuler/kernel/pulls/8537

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4129b7db fbf65ac3

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+7 −6
Original line number Diff line number Diff line
@@ -4716,6 +4716,12 @@ static void debugfs_bist_init_v3_hw(struct hisi_hba *hisi_hba) 
	hisi_hba->debugfs_bist_linkrate = SAS_LINK_RATE_1_5_GBPS;

}



static void debugfs_exit_v3_hw(struct hisi_hba *hisi_hba)

{

	debugfs_remove_recursive(hisi_hba->debugfs_dir);

	hisi_hba->debugfs_dir = NULL;

}



static void debugfs_init_v3_hw(struct hisi_hba *hisi_hba)

{

	struct device *dev = hisi_hba->dev;
@@ -4739,18 +4745,13 @@ static void debugfs_init_v3_hw(struct hisi_hba *hisi_hba) 


	for (i = 0; i < hisi_sas_debugfs_dump_count; i++) {

		if (debugfs_alloc_v3_hw(hisi_hba, i)) {

			debugfs_remove_recursive(hisi_hba->debugfs_dir);

			debugfs_exit_v3_hw(hisi_hba);

			dev_dbg(dev, "failed to init debugfs!\n");

			break;

		}

	}

}



static void debugfs_exit_v3_hw(struct hisi_hba *hisi_hba)

{

	debugfs_remove_recursive(hisi_hba->debugfs_dir);

}



static int

hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{