Merge "scsi: ufs: Fix possible unclocked register access to AHIT in probe path" (300d866b) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/scsi/ufs/ufshcd.c

+7 −7

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

		ufshcd_wb_config(hba);

		/*
		* Enable auto hibern8 if supported, after full host and
		* device initialization.
		*/
		ufshcd_set_auto_hibern8_timer(hba);

		/*
		* If we are in error handling context or in power management callbacks
		* context, no need to scan the host
		@@ -9142,12 +9148,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
		pm_runtime_put_sync(hba->dev);
		}

		/*
		* Enable auto hibern8 if supported, after full host and
		* device initialization.
		*/
		ufshcd_set_auto_hibern8_timer(hba);

		out:
		if (ret) {
		ufshcd_set_ufs_dev_poweroff(hba);