summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/bcm2835.c
diff options
context:
space:
mode:
authorStefan Wahren <stefan.wahren@i2se.com>2018-11-11 21:23:57 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2018-12-17 08:26:24 +0100
commit37fefadee8bb665ae337a15aa635dabff9f66ade (patch)
treeca68d500b3fe3463a38b828231ab55d11c1da9e4 /drivers/mmc/host/bcm2835.c
parentaf19b7ce76ba220f358c82b0a5e7d68909a23aa5 (diff)
downloadlinux-stable-37fefadee8bb665ae337a15aa635dabff9f66ade.tar.gz
linux-stable-37fefadee8bb665ae337a15aa635dabff9f66ade.tar.bz2
linux-stable-37fefadee8bb665ae337a15aa635dabff9f66ade.zip
mmc: bcm2835: Terminate timeout work synchronously
It's better to make sure that the timeout work is really terminated before calling mmc_request_done. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Acked-by: Eric Anholt <eric@anholt.net> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/bcm2835.c')
-rw-r--r--drivers/mmc/host/bcm2835.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index cdfc24f1093b..a7961c391de6 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(&host->timeout_work);
+ cancel_delayed_work_sync(&host->timeout_work);
mrq = host->mrq;