Commit aea64b58 authored by Stefan Wahren's avatar Stefan Wahren Committed by Ulf Hansson
Browse files

Revert "mmc: bcm2835: Terminate timeout work synchronously"

The commit 37fefade ("mmc: bcm2835: Terminate timeout work
synchronously") causes lockups in case of hardware timeouts due the
timeout work also calling cancel_delayed_work_sync() on its own.
So revert it.

Fixes: 37fefade

 ("mmc: bcm2835: Terminate timeout work synchronously")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f74c2bb9
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment