Merge "mmc: sdhci-msm: Dont wait infinitely for pwr_irq interrupt" (16dac7a6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/mmc/host/sdhci-msm.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -204,6 +204,9 @@ enum sdc_mpm_pin_state {
		#define NUM_TUNING_PHASES 16
		#define MAX_DRV_TYPES_SUPPORTED_HS200 3

		/* Timeout value to avoid infinite waiting for pwr_irq */
		#define MSM_PWR_IRQ_TIMEOUT_MS 5000

		static const u32 tuning_block_64[] = {
		0x00FF0FFF, 0xCCC3CCFF, 0xFFCC3CC3, 0xEFFEFFFE,
		0xDDFFDFFF, 0xFBFFFBFF, 0xFF7FFFBF, 0xEFBDF777,
		@@ -2353,8 +2356,10 @@ static void sdhci_msm_check_power_status(struct sdhci_host *host, u32 req_type)
		*/
		if (done)
		init_completion(&msm_host->pwr_irq_completion);
		else
		wait_for_completion(&msm_host->pwr_irq_completion);
		else if (!wait_for_completion_timeout(&msm_host->pwr_irq_completion,
		msecs_to_jiffies(MSM_PWR_IRQ_TIMEOUT_MS)))
		__WARN_printf("%s: request(%d) timed out waiting for pwr_irq\n",
		mmc_hostname(host->mmc), req_type);

		pr_debug("%s: %s: request %d done\n", mmc_hostname(host->mmc),
		__func__, req_type);