diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-11 16:59:01 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-11 16:59:01 +0300 |
| commit | 20964a11fa8b70019af83785fd4d639f7b90ae4d (patch) | |
| tree | 7b6ad938be6e93c642468c7bd8c1f1c8c6aa07cd /drivers/mmc/host/bcm2835.c | |
| parent | 7d44061704ddf7e30d5ab746f6da9d821b427118 (diff) | |
| parent | 49baa01c8b99ef92958e18fb58ebeb5dfdcde8af (diff) | |
| download | linux-20964a11fa8b70019af83785fd4d639f7b90ae4d.tar.xz | |
Merge branch 'fixes' into next
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 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; |