Merge "scsi: ufs: Hold auto suspend until ufs async scan completes" (5d0cb448) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/scsi/ufs/ufshcd.c

+2 −3

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-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
		*
		* Authors:
		* Santosh Yaraganavi <santosh.sy@samsung.com>
		@@ -7772,7 +7772,6 @@ static int ufshcd_add_lus(struct ufs_hba *hba)

		ufs_bsg_probe(hba);
		scsi_scan_host(hba->host);
		pm_runtime_put_sync(hba->dev);

		out:
		return ret;
		@@ -7933,10 +7932,10 @@ static void ufshcd_async_scan(void *data, async_cookie_t cookie)
		* present, turn off the power/clocks etc.
		*/
		if (ret) {
		pm_runtime_put_sync(hba->dev);
		ufshcd_exit_clk_scaling(hba);
		ufshcd_hba_exit(hba);
		}
		pm_runtime_put_sync(hba->dev);
		}

		static enum blk_eh_timer_return ufshcd_eh_timed_out(struct scsi_cmnd *scmd)