提交 984b6dbc 编写于 作者: B Bart Van Assche 提交者: Zheng Zengkai

scsi: ufs: qcom: Fix ufs_qcom_resume()

stable inclusion
from stable-v5.10.121
commit 02192ee93684e2989ec359821bc91850a3c46d5e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6CQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=02192ee93684e2989ec359821bc91850a3c46d5e

--------------------------------

[ Upstream commit bee40dc1 ]

Clearing hba->is_sys_suspended if ufs_qcom_resume() succeeds is wrong. That
variable must only be cleared if all actions involved in a resume succeed.
Hence remove the statement that clears hba->is_sys_suspended from
ufs_qcom_resume().

Link: https://lore.kernel.org/r/20220419225811.4127248-23-bvanassche@acm.org
Fixes: 81c0fc51 ("ufs-qcom: add support for Qualcomm Technologies Inc platforms")
Tested-by: NBean Huo <beanhuo@micron.com>
Reviewed-by: NBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: NBean Huo <beanhuo@micron.com>
Signed-off-by: NBart Van Assche <bvanassche@acm.org>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 0281efa7
...@@ -623,12 +623,7 @@ static int ufs_qcom_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) ...@@ -623,12 +623,7 @@ static int ufs_qcom_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
return err; return err;
} }
err = ufs_qcom_ice_resume(host); return ufs_qcom_ice_resume(host);
if (err)
return err;
hba->is_sys_suspended = false;
return 0;
} }
static void ufs_qcom_dev_ref_clk_ctrl(struct ufs_qcom_host *host, bool enable) static void ufs_qcom_dev_ref_clk_ctrl(struct ufs_qcom_host *host, bool enable)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册