From: JaeHun Jung <jh0801.jung@samsung.com>
Date: Mon, 30 Jul 2018 11:26:08 +0000 (+0900)
Subject: [COMMON] mmc: dw_mmc: Fix minor version merge conflict
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ba229b743b3dc308d23e429c20e35b12b06073c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[COMMON] mmc: dw_mmc: Fix minor version merge conflict

Change-Id: I7821c349ada1c4e516de0217004e98f45890cd01
Signed-off-by: JaeHun Jung <jh0801.jung@samsung.com>
---

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index e532528cdc5d..cdd94fefa2cf 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1442,14 +1442,9 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)
 	 * Card write Threshold is introduced since 2.80a
 	 * It's used when HS400 mode is enabled.
 	 */
-<<<<<<< HEAD
-	if (data->flags & MMC_DATA_WRITE && !(host->timing != MMC_TIMING_MMC_HS400))
-		return;
-=======
 	if (data->flags & MMC_DATA_WRITE &&
 		host->timing != MMC_TIMING_MMC_HS400)
 		goto disable;
->>>>>>> 818299f6bdae
 
 	if (data->flags & MMC_DATA_WRITE)
 		enable = SDMMC_CARD_WR_THR_EN;
@@ -1457,12 +1452,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)
 		enable = SDMMC_CARD_RD_THR_EN;
 
 	if (host->timing != MMC_TIMING_MMC_HS200 &&
-<<<<<<< HEAD
-	    host->timing != MMC_TIMING_MMC_HS400 && host->timing != MMC_TIMING_UHS_SDR104)
-=======
 	    host->timing != MMC_TIMING_UHS_SDR104 &&
 	    host->timing != MMC_TIMING_MMC_HS400)
->>>>>>> 818299f6bdae
 		goto disable;
 
 	blksz_depth = blksz / (1 << host->data_shift);