diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:31 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:31 +0200 |
commit | 088eb2a84b3b093af60bbe0b65151e8a9cd2d57d (patch) | |
tree | 8f145d8c71f6e249d6664b5482ac216b8c6e4016 /drivers/mmc/core/cd-gpio.c | |
parent | 6217a69a1e38807b3046b4fd6e4bf413e0e03b67 (diff) | |
parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) |
Merge tag 'v3.5-rc7' into late/soc
Linux 3.5-rc7
Diffstat (limited to 'drivers/mmc/core/cd-gpio.c')
-rw-r--r-- | drivers/mmc/core/cd-gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/cd-gpio.c b/drivers/mmc/core/cd-gpio.c index f13e38decea..8f5dc08d659 100644 --- a/drivers/mmc/core/cd-gpio.c +++ b/drivers/mmc/core/cd-gpio.c @@ -50,8 +50,8 @@ int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio) goto egpioreq; ret = request_threaded_irq(irq, NULL, mmc_cd_gpio_irqt, - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, - cd->label, host); + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | + IRQF_ONESHOT, cd->label, host); if (ret < 0) goto eirqreq; |