Merge "mmc: sdhci-msm: fix tracepoint for pm debugging" (bf7c99c1) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mmc/host/sdhci-msm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4950,8 +4950,6 @@ static int sdhci_msm_runtime_suspend(struct device *dev)
		if (msm_host->msm_bus_vote.client_handle)
		sdhci_msm_bus_cancel_work_and_set_vote(host, 0);
		}
		trace_sdhci_msm_runtime_suspend(mmc_hostname(host->mmc), 0,
		ktime_to_us(ktime_sub(ktime_get(), start)));

		if (host->is_crypto_en) {
		ret = sdhci_msm_ice_suspend(host);
		@@ -4959,6 +4957,8 @@ static int sdhci_msm_runtime_suspend(struct device *dev)
		pr_err("%s: failed to suspend crypto engine %d\n",
		mmc_hostname(host->mmc), ret);
		}
		trace_sdhci_msm_runtime_suspend(mmc_hostname(host->mmc), 0,
		ktime_to_us(ktime_sub(ktime_get(), start)));
		return 0;
		}