projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-imx
/
mach-pcm037.c
diff --git
a/arch/arm/mach-imx/mach-pcm037.c
b/arch/arm/mach-imx/mach-pcm037.c
index 20cc53f4cee1f1372c619925d0fe74e47eafd075..639a3dfb00923317871724f1848ace2d9c7e0125 100644
(file)
--- a/
arch/arm/mach-imx/mach-pcm037.c
+++ b/
arch/arm/mach-imx/mach-pcm037.c
@@
-371,8
+371,7
@@
static int pcm970_sdhc1_init(struct device *dev, irq_handler_t detect_irq,
#endif
ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_SCK6)), detect_irq,
- IRQF_DISABLED | IRQF_TRIGGER_FALLING,
- "sdhc-detect", data);
+ IRQF_TRIGGER_FALLING, "sdhc-detect", data);
if (ret)
goto err_gpio_free_2;