git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ctxfi' into for-linus
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
omap.c
diff --git
a/drivers/mmc/host/omap.c
b/drivers/mmc/host/omap.c
index
bfa25c0
..
dceb5ee
100644
(file)
--- a/
drivers/mmc/host/omap.c
+++ b/
drivers/mmc/host/omap.c
@@
-822,7
+822,7
@@
static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
del_timer(&host->cmd_abort_timer);
host->abort = 1;
OMAP_MMC_WRITE(host, IE, 0);
- disable_irq(host->irq);
+ disable_irq
_nosync
(host->irq);
schedule_work(&host->cmd_abort_work);
return IRQ_HANDLED;
}