From 123944b31016b5ca03d95011e7b2610d42452f4b Mon Sep 17 00:00:00 2001 From: Stefan Nilsson XK Date: Fri, 13 May 2011 14:52:51 +0200 Subject: SDIO: Clean work queue before destroy Make sure to clean up any delayed works on the SDIO IRQ work queue before destroying it. ST-Ericsson Linux next: Not tested ST-Ericsson ID: AP340422 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Idd4236bd1d6ce30fd17b602bfff3f1f2b8303289 Signed-off-by: Stefan Nilsson XK Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23053 Reviewed-by: QATEST Reviewed-by: Ulf HANSSON Reviewed-by: Jonas ABERG --- drivers/mmc/core/sdio_irq.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/mmc') diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c index 96f81237d75..7502ba3ebda 100644 --- a/drivers/mmc/core/sdio_irq.c +++ b/drivers/mmc/core/sdio_irq.c @@ -173,6 +173,7 @@ static int sdio_card_irq_put(struct mmc_card *card) if (!--host->sdio_irqs) { host->ops->enable_sdio_irq(host, false); + cancel_delayed_work_sync(&host->sdio_irq_work); destroy_workqueue(host->sdio_irq_workqueue); host->sdio_irq_workqueue = NULL; } -- cgit v1.2.3