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

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

Merge "scsi: ufs: fix clock ungate checks for AH8 error in err handler"

parents 788a19a8 9615a0a7

drivers/scsi/ufs/ufshcd.c

+1 −2
Original line number Diff line number Diff line
@@ -5230,6 +5230,7 @@ static int ufshcd_link_recovery(struct ufs_hba *hba) 
	 */

	hba->ufshcd_state = UFSHCD_STATE_ERROR;

	hba->force_host_reset = true;

	ufshcd_set_eh_in_progress(hba);

	schedule_work(&hba->eh_work);



	/* wait for the reset work to finish */
@@ -6984,8 +6985,6 @@ static void ufshcd_err_handler(struct work_struct *work) 
	 * process of gating when the err handler runs.

	 */

	if (unlikely((hba->clk_gating.state != CLKS_ON) &&

	    (hba->clk_gating.state == REQ_CLKS_OFF &&

	     ufshcd_is_link_hibern8(hba)) &&

	    ufshcd_is_auto_hibern8_supported(hba) &&

	    hba->hibern8_on_idle.is_enabled)) {

		spin_unlock_irqrestore(hba->host->host_lock, flags);