diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:28:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:28:16 -0700 |
| commit | 63068465fa9ba8258e341f70c07cd2221b8c114d (patch) | |
| tree | 79ec2bc8af8b95c09479ddc0661b2dec89281e92 /drivers/mmc/pxamci.c | |
| parent | 35b7ac4c48fa851600c028e088d2239a2cf3dfca (diff) | |
| parent | c26971cbb39727b0b692c6236f890ba13046a663 (diff) | |
| download | kernel_samsung_smdk4412-63068465fa9ba8258e341f70c07cd2221b8c114d.zip kernel_samsung_smdk4412-63068465fa9ba8258e341f70c07cd2221b8c114d.tar.gz kernel_samsung_smdk4412-63068465fa9ba8258e341f70c07cd2221b8c114d.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/pxamci.c')
| -rw-r--r-- | drivers/mmc/pxamci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index e99a53b..b53af57 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c @@ -423,7 +423,9 @@ static void pxamci_dma_irq(int dma, void *devid, struct pt_regs *regs) static irqreturn_t pxamci_detect_irq(int irq, void *devid, struct pt_regs *regs) { - mmc_detect_change(devid); + struct pxamci_host *host = mmc_priv(devid); + + mmc_detect_change(devid, host->pdata->detect_delay); return IRQ_HANDLED; } |