Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e53264fa authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: Disable interrupt in reset path"

parents 83b99235 7b4636ea

drivers/scsi/ufs/ufs-qcom.c

+10 −0
Original line number Diff line number Diff line
@@ -446,12 +446,17 @@ static int ufs_qcom_host_reset(struct ufs_hba *hba) 
{

	int ret = 0;

	struct ufs_qcom_host *host = ufshcd_get_variant(hba);

	bool reenable_intr = false;



	if (!host->core_reset) {

		dev_warn(hba->dev, "%s: reset control not set\n", __func__);

		goto out;

	}



	reenable_intr = hba->is_irq_enabled;

	disable_irq(hba->irq);

	hba->is_irq_enabled = false;



	ret = reset_control_assert(host->core_reset);

	if (ret) {

		dev_err(hba->dev, "%s: core_reset assert failed, err = %d\n",
@@ -473,6 +478,11 @@ static int ufs_qcom_host_reset(struct ufs_hba *hba) 


	usleep_range(1000, 1100);



	if (reenable_intr) {

		enable_irq(hba->irq);

		hba->is_irq_enabled = true;

	}



out:

	return ret;

}