From 37474e949b0ebb9d64910172b67c8cb85eeda2bd Mon Sep 17 00:00:00 2001 From: JaeHun Jung Date: Fri, 1 Jun 2018 14:57:40 +0900 Subject: [PATCH] [COMMON] mmc: dw_mmc: dw_mmc caps bug fix Change-Id: Ifaf38aca4b0585c33352db5262b2524571707233 Signed-off-by: JaeHun Jung --- drivers/mmc/host/dw_mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index de7b8bf3a3a6..7e7220391c90 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3335,7 +3335,7 @@ static int dw_mci_init_slot_caps(struct dw_mci_slot *slot) int ctrl_id; if (host->pdata->caps) - mmc->caps = host->pdata->caps; + mmc->caps |= host->pdata->caps; /* * Support MMC_CAP_ERASE by default. @@ -3344,7 +3344,7 @@ static int dw_mci_init_slot_caps(struct dw_mci_slot *slot) mmc->caps |= MMC_CAP_ERASE; if (host->pdata->pm_caps) - mmc->pm_caps = host->pdata->pm_caps; + mmc->pm_caps |= host->pdata->pm_caps; if (host->dev->of_node) { ctrl_id = of_alias_get_id(host->dev->of_node, "mshc"); @@ -3364,7 +3364,7 @@ static int dw_mci_init_slot_caps(struct dw_mci_slot *slot) } if (host->pdata->caps2) - mmc->caps2 = host->pdata->caps2; + mmc->caps2 |= host->pdata->caps2; /* Process SDIO IRQs through the sdio_irq_work. */ if (mmc->caps & MMC_CAP_SDIO_IRQ) -- 2.20.1