diff options
| author | Guennadi Liakhovetski <[email protected]> | 2012-07-11 02:54:11 +0000 |
|---|---|---|
| committer | Chris Ball <[email protected]> | 2012-07-11 03:03:57 +0000 |
| commit | 623b51fc8642fd3c795fa9903be3adaa537ad9c5 (patch) | |
| tree | 50d95af51ae3f8533fa9a6eabc8f3f95f8fff7df /drivers/mmc/core | |
| parent | mmc: core: Revert "skip card initialization if power class selection fails" (diff) | |
| download | kernel-623b51fc8642fd3c795fa9903be3adaa537ad9c5.tar.gz kernel-623b51fc8642fd3c795fa9903be3adaa537ad9c5.zip | |
mmc: cd-gpio: pass IRQF_ONESHOT to request_threaded_irq()
Fix a boot regression on Mackerel boards with sh_mobile_sdhi
in existing kernels causing:
genirq: Threaded irq requested with handler=NULL and !ONESHOT for irq XXX
caused by 1c6c6952 (genirq: Reject bogus threaded irq requests).
This is backported from Guennadi's patch:
"mmc: extend and rename cd-gpio helpers to handle more slot GPIO functions"
Reported-by: Rafael J. Wysocki <[email protected]>
Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Chris Ball <[email protected]>
Diffstat (limited to 'drivers/mmc/core')
| -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 f13e38deceac..8f5dc08d6598 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; |