diff options
| author | Colin Cross <ccross@android.com> | 2011-06-22 15:35:38 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-22 15:35:38 -0700 |
| commit | 0a7e36012f4af64b18bbdbbf4aa4e25e79ecb1b3 (patch) | |
| tree | c37a1fbf8b718b058197f6bdbba9bd8c55b86461 /drivers/mmc/host | |
| parent | 527d5ce86899f02b5d1ff5d48423a57271878c7a (diff) | |
| parent | 2932297a0c52322929092e3c2443fbe59c42ee2b (diff) | |
| download | kernel_samsung_tuna-0a7e36012f4af64b18bbdbbf4aa4e25e79ecb1b3.zip kernel_samsung_tuna-0a7e36012f4af64b18bbdbbf4aa4e25e79ecb1b3.tar.gz kernel_samsung_tuna-0a7e36012f4af64b18bbdbbf4aa4e25e79ecb1b3.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 5da5bea..7721de9 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1144,9 +1144,17 @@ static int __devinit mmci_probe(struct amba_device *dev, else if (ret != -ENOSYS) goto err_gpio_cd; + /* + * A gpio pin that will detect cards when inserted and removed + * will most likely want to trigger on the edges if it is + * 0 when ejected and 1 when inserted (or mutatis mutandis + * for the inverted case) so we request triggers on both + * edges. + */ ret = request_any_context_irq(gpio_to_irq(plat->gpio_cd), - mmci_cd_irq, 0, - DRIVER_NAME " (cd)", host); + mmci_cd_irq, + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + DRIVER_NAME " (cd)", host); if (ret >= 0) host->gpio_cd_irq = gpio_to_irq(plat->gpio_cd); } |