Merge "mmc: host: Reprogram keys after enabling cqhci crypto" (0a69438b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/mmc/host/cqhci.c

+4 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/* Copyright (c) 2020, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
		*/

		#include <linux/delay.h>
		@@ -361,8 +361,10 @@ static int cqhci_enable(struct mmc_host mmc, struct mmc_card card)
		return err;
		}

		if (cqhci_host_is_crypto_supported(cq_host))
		if (cqhci_host_is_crypto_supported(cq_host)) {
		cqhci_crypto_enable(cq_host);
		cqhci_crypto_recovery_finish(cq_host);
		}

		__cqhci_enable(cq_host);

		@@ -1168,7 +1170,6 @@ static void cqhci_recovery_finish(struct mmc_host *mmc)

		cqhci_set_irqs(cq_host, CQHCI_IS_MASK);

		cqhci_crypto_recovery_finish(cq_host);
		pr_debug("%s: cqhci: recovery done\n", mmc_hostname(mmc));
		mmc_log_string(mmc, "recovery done\n");
		}