diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:29:00 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:29:00 +0200 |
| commit | 53c716412708db7000e06292fb89b2609f9a48f7 (patch) | |
| tree | 3ede481ee0926f0e53e14bba61028d307d58296c /drivers/mmc/host/sdhci.c | |
| parent | e6d64ce06c28b615ebfeab7b8bfad6136ea83095 (diff) | |
| parent | aec256d0ecd561036f188dbc8fa7924c47a9edfd (diff) | |
Merge branch 'for-5.4/apple' into for-linus
- stuck 'fn' key fix for hid-apple from Joao Moreno
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 59acf8e3331e..a5dc5aae973e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3320,7 +3320,7 @@ int sdhci_runtime_suspend_host(struct sdhci_host *host) } EXPORT_SYMBOL_GPL(sdhci_runtime_suspend_host); -int sdhci_runtime_resume_host(struct sdhci_host *host) +int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset) { struct mmc_host *mmc = host->mmc; unsigned long flags; @@ -3331,7 +3331,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host) host->ops->enable_dma(host); } - sdhci_init(host, 0); + sdhci_init(host, soft_reset); if (mmc->ios.power_mode != MMC_POWER_UNDEFINED && mmc->ios.power_mode != MMC_POWER_OFF) { |