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

Merge branch 'fixes' into next

parents 7d440617 49baa01c

drivers/mmc/host/bcm2835.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/mmc/host/sdhci-pci-o2micro.c

+1 −1
Original line number Diff line number Diff line
@@ -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,