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

!11960 scsi: ufs: core: Remove SCSI host only if added 

Merge Pull Request from: @ci-robot 
 
PR sync from: Pu Lehui <pulehui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OS3B3ADIPMPN74SPLXLYDVT7FHHHSCU5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAU9QP 
 
Link:https://gitee.com/openeuler/kernel/pulls/11960

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 14687414 17305932

drivers/ufs/core/ufshcd.c

+5 −2
Original line number Diff line number Diff line
@@ -10119,6 +10119,7 @@ void ufshcd_remove(struct ufs_hba *hba) 
	blk_mq_destroy_queue(hba->tmf_queue);

	blk_put_queue(hba->tmf_queue);

	blk_mq_free_tag_set(&hba->tmf_tag_set);

	if (hba->scsi_host_added)

		scsi_remove_host(hba->host);

	/* disable interrupts */

	ufshcd_disable_intr(hba, hba->intr_mask);
@@ -10391,6 +10392,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) 
			dev_err(hba->dev, "scsi_add_host failed\n");

			goto out_disable;

		}

		hba->scsi_host_added = true;

	}



	hba->tmf_tag_set = (struct blk_mq_tag_set) {
@@ -10472,6 +10474,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) 
free_tmf_tag_set:

	blk_mq_free_tag_set(&hba->tmf_tag_set);

out_remove_scsi_host:

	if (hba->scsi_host_added)

		scsi_remove_host(hba->host);

out_disable:

	hba->is_irq_enabled = false;