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

Commit a5c9eff4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: fix deadlock when attempting hibern8 during clock gating"

parents 0b1523b7 71413311

drivers/scsi/ufs/ufshcd.c

+2 −2
Original line number Diff line number Diff line
@@ -2645,7 +2645,6 @@ int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd) 
	bool uic_ready;

	int retries = POWER_MODE_RETRIES;



	ufshcd_hold(hba, false);

	mutex_lock(&hba->uic_cmd_mutex);

	init_completion(&uic_async_done);
@@ -2714,7 +2713,6 @@ out: 
	hba->uic_async_done = NULL;

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

	mutex_unlock(&hba->uic_cmd_mutex);

	ufshcd_release(hba);

	return ret;

}
@@ -2744,7 +2742,9 @@ static int ufshcd_uic_change_pwr_mode(struct ufs_hba *hba, u8 mode) 
	uic_cmd.command = UIC_CMD_DME_SET;

	uic_cmd.argument1 = UIC_ARG_MIB(PA_PWRMODE);

	uic_cmd.argument3 = mode;

	ufshcd_hold(hba, false);

	ret = ufshcd_uic_pwr_ctrl(hba, &uic_cmd);

	ufshcd_release(hba);

out:

	return ret;

}