diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-11 15:59:01 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-11 15:59:01 +0200 |
| commit | 20964a11fa8b70019af83785fd4d639f7b90ae4d (patch) | |
| tree | 7b6ad938be6e93c642468c7bd8c1f1c8c6aa07cd | |
| parent | 7d44061704ddf7e30d5ab746f6da9d821b427118 (diff) | |
| parent | 49baa01c8b99ef92958e18fb58ebeb5dfdcde8af (diff) | |
| download | linux-20964a11fa8b70019af83785fd4d639f7b90ae4d.tar.bz2 | |
Merge branch 'fixes' into next
| -rw-r--r-- | drivers/mmc/host/bcm2835.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-pci-o2micro.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index 7c30d79a9fdd..148414d7f0c9 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -597,7 +597,7 @@ static void bcm2835_finish_request(struct bcm2835_host *host) struct dma_chan *terminate_chan = NULL; struct mmc_request *mrq; - cancel_delayed_work_sync(&host->timeout_work); + cancel_delayed_work(&host->timeout_work); mrq = host->mrq; diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c index d879d917c013..fa8105087d68 100644 --- a/drivers/mmc/host/sdhci-pci-o2micro.c +++ b/drivers/mmc/host/sdhci-pci-o2micro.c @@ -552,7 +552,6 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) mmc_hostname(host->mmc)); host->flags &= ~SDHCI_SIGNALING_330; 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_SDIO; pci_write_config_dword(chip->pdev, @@ -802,6 +801,7 @@ static const struct sdhci_ops sdhci_pci_o2_ops = { const struct sdhci_pci_fixes sdhci_o2 = { .probe = sdhci_pci_o2_probe, .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, + .quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD, .probe_slot = sdhci_pci_o2_probe_slot, #ifdef CONFIG_PM_SLEEP .resume = sdhci_pci_o2_resume, |