On Sun, 8 Sep 2019 at 09:46, Stefan Wahren <wahrenst@xxxxxxx> wrote: > > The commit 37fefadee8bb ("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: 37fefadee8bb ("mmc: bcm2835: Terminate timeout work synchronously") > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Stefan Wahren <wahrenst@xxxxxxx> Applied for fixes, thanks! Kind regards Uffe > --- > drivers/mmc/host/bcm2835.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c > index 7e0d3a4..bb31e13 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; > > -- > 2.7.4 >