From 29c49deda9445d6eb538e435ccfeb97bf9fb9e4c Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Tue, 7 Feb 2012 14:48:53 +0200 Subject: [PATCH] --- yaml --- r: 297347 b: refs/heads/master c: da721cf7808f9731454757d704f0aa69ae2f1aae h: refs/heads/master i: 297345: 9433bbe671775bfefeaf76170acc6ea7975ca16d 297343: 33b1e8f43d69bf00e5411f4d4a2a177883995322 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-pci.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e892cf2d18d7..1c62c6755b2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83bb24aaa4af2ec7c127cc2a5fa7ca9f64cdd13d +refs/heads/master: da721cf7808f9731454757d704f0aa69ae2f1aae diff --git a/trunk/drivers/mmc/host/sdhci-pci.c b/trunk/drivers/mmc/host/sdhci-pci.c index 6ebdc4010e7c..9952535671f2 100644 --- a/trunk/drivers/mmc/host/sdhci-pci.c +++ b/trunk/drivers/mmc/host/sdhci-pci.c @@ -244,7 +244,8 @@ static inline void sdhci_pci_remove_own_cd(struct sdhci_pci_slot *slot) static int mfd_emmc_probe_slot(struct sdhci_pci_slot *slot) { slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE; - slot->host->mmc->caps2 = MMC_CAP2_BOOTPART_NOACC; + slot->host->mmc->caps2 |= MMC_CAP2_BOOTPART_NOACC | + MMC_CAP2_HC_ERASE_SZ; return 0; }