diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2013-08-29 08:54:54 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-08-29 08:54:54 +0800 |
| commit | 193ad77cb9094e52ff0df8987c0d7cb96f0fb78d (patch) | |
| tree | b08295d4f22658dcb437771e46c7918459d8e8af | |
| parent | da5c25852ca7f0b120c4fe300731ee4d407e5c05 (diff) | |
| parent | b18729937c44a975fec08a1bde61514c15e0d011 (diff) | |
Merge commit 'tracking-hilt-mmc-fix-0828' into integration-hilt-lsk-androidintegration-hilt-lsk-android-0829
* commit 'tracking-hilt-mmc-fix-0828':
mmc: hisilicon: reset old_timing when suspend
| -rw-r--r-- | drivers/mmc/host/dw_mmc-hisilicon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/dw_mmc-hisilicon.c b/drivers/mmc/host/dw_mmc-hisilicon.c index 382af29c6ecb..50ba8eb81f2b 100644 --- a/drivers/mmc/host/dw_mmc-hisilicon.c +++ b/drivers/mmc/host/dw_mmc-hisilicon.c @@ -348,10 +348,12 @@ static int dw_mci_hs_suspend(struct device *dev) { int ret; struct dw_mci *host = dev_get_drvdata(dev); + struct dw_mci_hs_priv_data *priv = host->priv; ret = dw_mci_suspend(host); if (ret) return ret; + priv->old_timing = -1; return 0; } |