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 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
pxamci.c
diff --git
a/drivers/mmc/host/pxamci.c
b/drivers/mmc/host/pxamci.c
index
0ed4895
..
e4f00e7
100644
(file)
--- a/
drivers/mmc/host/pxamci.c
+++ b/
drivers/mmc/host/pxamci.c
@@
-544,7
+544,7
@@
static irqreturn_t pxamci_detect_irq(int irq, void *devid)
{
struct pxamci_host *host = mmc_priv(devid);
- mmc_detect_change(devid,
host->pdata->detect_delay
);
+ mmc_detect_change(devid,
msecs_to_jiffies(host->pdata->detect_delay_ms)
);
return IRQ_HANDLED;
}