diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-19 19:10:31 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-19 19:10:30 -0800 |
| commit | a3a6fc8dc64348fc343319720513008ac55d875d (patch) | |
| tree | 7f4408dfda4c57ddbcf1e559c2ed185b927aab99 /drivers | |
| parent | d4f45fff4ef6175e40c6b52f712a473575e59b0b (diff) | |
| parent | 78d5bbde2159f439866a7b89331b65aca4542b2e (diff) | |
Merge "mmc: sdhci-msm-ice: Update ice config vop to config_start"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/sdhci-msm-ice.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/mmc/host/sdhci-msm-ice.c b/drivers/mmc/host/sdhci-msm-ice.c index abf2ae2020c9..2ef459582aae 100644 --- a/drivers/mmc/host/sdhci-msm-ice.c +++ b/drivers/mmc/host/sdhci-msm-ice.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2015, 2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -102,7 +102,7 @@ int sdhci_msm_ice_init(struct sdhci_host *host) struct sdhci_msm_host *msm_host = pltfm_host->priv; int err = 0; - if (msm_host->ice.vops->config) { + if (msm_host->ice.vops->init) { err = msm_host->ice.vops->init(msm_host->ice.pdev, msm_host, sdhci_msm_ice_error_cb); @@ -148,9 +148,10 @@ int sdhci_msm_ice_cfg(struct sdhci_host *host, struct mmc_request *mrq, req = mrq->req; if (req) { lba = req->__sector; - if (msm_host->ice.vops->config) { - err = msm_host->ice.vops->config(msm_host->ice.pdev, - req, &ice_set); + if (msm_host->ice.vops->config_start) { + err = msm_host->ice.vops->config_start( + msm_host->ice.pdev, + req, &ice_set, false); if (err) { pr_err("%s: ice config failed %d\n", mmc_hostname(host->mmc), err); |