projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[cascardo/linux.git]
/
drivers
/
mmc
/
host
/
omap_hsmmc.c
diff --git
a/drivers/mmc/host/omap_hsmmc.c
b/drivers/mmc/host/omap_hsmmc.c
index
5d46021
..
078fdf1
100644
(file)
--- a/
drivers/mmc/host/omap_hsmmc.c
+++ b/
drivers/mmc/host/omap_hsmmc.c
@@
-2290,7
+2290,7
@@
static int omap_hsmmc_remove(struct platform_device *pdev)
free_irq(host->irq, host);
if (mmc_slot(host).card_detect_irq)
free_irq(mmc_slot(host).card_detect_irq, host);
- flush_
scheduled_work(
);
+ flush_
work_sync(&host->mmc_carddetect_work
);
mmc_host_disable(host->mmc);
clk_disable(host->iclk);