diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-14 12:08:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-14 12:08:19 -0700 |
| commit | 1c4c5e2528af0c803fb1171632074f4070229a75 (patch) | |
| tree | 73638cf03626fec0a815080dd384b47a15a212da /drivers/mmc/host/bcm2835.c | |
| parent | 592b8d8759ceb7086e1683e1796c7110e6c2ae8f (diff) | |
| parent | 87b5d602a1cc76169b8d81ec2c74c8d95d9350dc (diff) | |
Merge tag 'mmc-v5.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
- tmio: Fixup runtime PM management during probe and remove
- sdhci-pci-o2micro: Fix eMMC initialization for an AMD SoC
- bcm2835: Prevent lockups when terminating work
* tag 'mmc-v5.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: tmio: Fixup runtime PM management during remove
mmc: tmio: Fixup runtime PM management during probe
Revert "mmc: tmio: move runtime PM enablement to the driver implementations"
Revert "mmc: sdhci: Remove unneeded quirk2 flag of O2 SD host controller"
Revert "mmc: bcm2835: Terminate timeout work synchronously"
Diffstat (limited to 'drivers/mmc/host/bcm2835.c')
| -rw-r--r-- | drivers/mmc/host/bcm2835.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index 7e0d3a49c06d..bb31e13648d6 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; |