Merge "scsi: ufs: synchronize between rls handler and clock scaling" (8ff70d80) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/scsi/ufs/ufshcd.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* This code is based on drivers/scsi/ufs/ufshcd.c
		* Copyright (C) 2011-2013 Samsung India Software Operations
		* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		*
		* Authors:
		* Santosh Yaraganavi <santosh.sy@samsung.com>
		@@ -6498,6 +6498,7 @@ static void ufshcd_rls_handler(struct work_struct *work)
		hba = container_of(work, struct ufs_hba, rls_work);
		ufshcd_scsi_block_requests(hba);
		pm_runtime_get_sync(hba->dev);
		down_write(&hba->lock);
		ret = ufshcd_wait_for_doorbell_clr(hba, U64_MAX);
		if (ret) {
		dev_err(hba->dev,
		@@ -6531,6 +6532,7 @@ static void ufshcd_rls_handler(struct work_struct *work)
		hba->restore_needed = false;

		out:
		up_write(&hba->lock);
		ufshcd_scsi_unblock_requests(hba);
		pm_runtime_put_sync(hba->dev);
		}