Skip to content

L
linux
Commit 20964a11 authored by Ulf Hansson's avatar Ulf Hansson
Browse files
Options

Merge branch 'fixes' into next

parents 7d440617 49baa01c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/mmc/host/bcm2835.c
View file @ 20964a11
...@@ -597,7 +597,7 @@ static void bcm2835_finish_request(struct bcm2835_host *host) ...@@ -597,7 +597,7 @@ static void bcm2835_finish_request(struct bcm2835_host *host)
struct dma_chan *terminate_chan = NULL; struct dma_chan *terminate_chan = NULL;
struct mmc_request *mrq; struct mmc_request *mrq;
cancel_delayed_work_sync(&host->timeout_work); cancel_delayed_work(&host->timeout_work);
mrq = host->mrq; mrq = host->mrq;
......
drivers/mmc/host/sdhci-pci-o2micro.c
View file @ 20964a11
...@@ -552,7 +552,6 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) ...@@ -552,7 +552,6 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
host->flags &= ~SDHCI_SIGNALING_330; host->flags &= ~SDHCI_SIGNALING_330;
host->flags |= SDHCI_SIGNALING_180; host->flags |= SDHCI_SIGNALING_180;
host->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
host->mmc->caps2 |= MMC_CAP2_NO_SD; host->mmc->caps2 |= MMC_CAP2_NO_SD;
host->mmc->caps2 |= MMC_CAP2_NO_SDIO; host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
pci_write_config_dword(chip->pdev, pci_write_config_dword(chip->pdev,
...@@ -802,6 +801,7 @@ static const struct sdhci_ops sdhci_pci_o2_ops = { ...@@ -802,6 +801,7 @@ static const struct sdhci_ops sdhci_pci_o2_ops = {
const struct sdhci_pci_fixes sdhci_o2 = { const struct sdhci_pci_fixes sdhci_o2 = {
.probe = sdhci_pci_o2_probe, .probe = sdhci_pci_o2_probe,
.quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
.quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD,
.probe_slot = sdhci_pci_o2_probe_slot, .probe_slot = sdhci_pci_o2_probe_slot,
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
.resume = sdhci_pci_o2_resume, .resume = sdhci_pci_o2_resume,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7