diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-01-23 14:05:58 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-28 13:13:26 +0000 |
| commit | 2687bd38573ff6f10d13f60c5c3576cce9cf260d (patch) | |
| tree | d05e26158e7c8e9b50fbb7fceca2dac4c91c3996 /arch/arm/mach-pxa/trizeps4.c | |
| parent | ca4d6cfcee0cb2d25c0eb3b0172ecc6f223133ef (diff) | |
| download | op-kernel-dev-2687bd38573ff6f10d13f60c5c3576cce9cf260d.zip op-kernel-dev-2687bd38573ff6f10d13f60c5c3576cce9cf260d.tar.gz | |
[ARM] pxa: fix mci_init functions returning -1
Fix all those PXA mci_init functions which return -1 rather than
propagating the error code to the higher levels. Remove the silly
set_irq_type() calls as well - use the flags for request_irq()
instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/trizeps4.c')
| -rw-r--r-- | arch/arm/mach-pxa/trizeps4.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index e4ba43b..853fc94 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c @@ -296,11 +296,10 @@ static int trizeps4_mci_init(struct device *dev, irq_handler_t mci_detect_int, v err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int, IRQF_DISABLED | IRQF_TRIGGER_RISING, "MMC card detect", data); - if (err) { + if (err) printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request MMC card detect IRQ\n"); - return -1; - } - return 0; + + return err; } static void trizeps4_mci_exit(struct device *dev, void *data) |
