diff options
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d622435d1bcc..add9fdfd1d8f 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
| @@ -1360,7 +1360,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) | |||
| 1360 | sdhci_runtime_pm_get(host); | 1360 | sdhci_runtime_pm_get(host); |
| 1361 | 1361 | ||
| 1362 | /* Firstly check card presence */ | 1362 | /* Firstly check card presence */ |
| 1363 | present = sdhci_do_get_cd(host); | 1363 | present = mmc->ops->get_cd(mmc); |
| 1364 | 1364 | ||
| 1365 | spin_lock_irqsave(&host->lock, flags); | 1365 | spin_lock_irqsave(&host->lock, flags); |
| 1366 | 1366 | ||
| @@ -2849,6 +2849,8 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, | |||
| 2849 | 2849 | ||
| 2850 | host = mmc_priv(mmc); | 2850 | host = mmc_priv(mmc); |
| 2851 | host->mmc = mmc; | 2851 | host->mmc = mmc; |
| 2852 | host->mmc_host_ops = sdhci_ops; | ||
| 2853 | mmc->ops = &host->mmc_host_ops; | ||
| 2852 | 2854 | ||
| 2853 | return host; | 2855 | return host; |
| 2854 | } | 2856 | } |
| @@ -3037,7 +3039,6 @@ int sdhci_add_host(struct sdhci_host *host) | |||
| 3037 | /* | 3039 | /* |
| 3038 | * Set host parameters. | 3040 | * Set host parameters. |
| 3039 | */ | 3041 | */ |
| 3040 | mmc->ops = &sdhci_ops; | ||
| 3041 | max_clk = host->max_clk; | 3042 | max_clk = host->max_clk; |
| 3042 | 3043 | ||
| 3043 | if (host->ops->get_min_clock) | 3044 | if (host->ops->get_min_clock) |
