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

Commit 2f3037b7 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: ice: Skip CTRL_INFO configuration"

parents 0f57ad04 ae1d5324
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
/*
 * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -368,8 +368,13 @@ int ufs_qcom_ice_cfg_start(struct ufs_qcom_host *qcom_host,
		return -EINVAL;
	}

	if (qcom_host->hw_ver.major == 0x3) {
		/* nothing to do here for version 0x3, exit silently */
	if (qcom_host->hw_ver.major >= 0x3) {
		/*
		 * ICE 3.0 crypto sequences were changed,
		 * CTRL_INFO register no longer exists
		 * and doesn't need to be configured.
		 * The configuration is done via utrd.
		 */
		return 0;
	}