diff options
Diffstat (limited to 'drivers/mmc/host/sdhci-s3c.c')
-rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 1af756ee0f9a..b19e7d435f8d 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c | |||
@@ -518,9 +518,6 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) | |||
518 | if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT) | 518 | if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT) |
519 | host->mmc->caps = MMC_CAP_NONREMOVABLE; | 519 | host->mmc->caps = MMC_CAP_NONREMOVABLE; |
520 | 520 | ||
521 | if (pdata->host_caps) | ||
522 | host->mmc->caps |= pdata->host_caps; | ||
523 | |||
524 | if (pdata->pm_caps) | 521 | if (pdata->pm_caps) |
525 | host->mmc->pm_caps |= pdata->pm_caps; | 522 | host->mmc->pm_caps |= pdata->pm_caps; |
526 | 523 | ||
@@ -544,6 +541,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) | |||
544 | if (pdata->host_caps) | 541 | if (pdata->host_caps) |
545 | host->mmc->caps |= pdata->host_caps; | 542 | host->mmc->caps |= pdata->host_caps; |
546 | 543 | ||
544 | if (pdata->host_caps2) | ||
545 | host->mmc->caps2 |= pdata->host_caps2; | ||
546 | |||
547 | ret = sdhci_add_host(host); | 547 | ret = sdhci_add_host(host); |
548 | if (ret) { | 548 | if (ret) { |
549 | dev_err(dev, "sdhci_add_host() failed\n"); | 549 | dev_err(dev, "sdhci_add_host() failed\n"); |