diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /drivers/mmc/pxamci.c | |
| parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
| parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 e99a53b09e32..b53af57074e3 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) | |||
| 423 | 423 | ||
| 424 | static irqreturn_t pxamci_detect_irq(int irq, void *devid, struct pt_regs *regs) | 424 | static irqreturn_t pxamci_detect_irq(int irq, void *devid, struct pt_regs *regs) |
| 425 | { | 425 | { |
| 426 | mmc_detect_change(devid); | 426 | struct pxamci_host *host = mmc_priv(devid); |
| 427 | |||
| 428 | mmc_detect_change(devid, host->pdata->detect_delay); | ||
| 427 | return IRQ_HANDLED; | 429 | return IRQ_HANDLED; |
| 428 | } | 430 | } |
| 429 | 431 | ||