diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-01-23 09:05:58 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-28 08:13:26 -0500 |
commit | 2687bd38573ff6f10d13f60c5c3576cce9cf260d (patch) | |
tree | d05e26158e7c8e9b50fbb7fceca2dac4c91c3996 /arch/arm/mach-pxa/tosa.c | |
parent | ca4d6cfcee0cb2d25c0eb3b0172ecc6f223133ef (diff) |
[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/tosa.c')
-rw-r--r-- | arch/arm/mach-pxa/tosa.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 240fd042083d..1919756900f4 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -184,16 +184,13 @@ static int tosa_mci_init(struct device *dev, irq_handler_t tosa_detect_int, void | |||
184 | 184 | ||
185 | tosa_mci_platform_data.detect_delay = msecs_to_jiffies(250); | 185 | tosa_mci_platform_data.detect_delay = msecs_to_jiffies(250); |
186 | 186 | ||
187 | err = request_irq(TOSA_IRQ_GPIO_nSD_DETECT, tosa_detect_int, IRQF_DISABLED, | 187 | err = request_irq(TOSA_IRQ_GPIO_nSD_DETECT, tosa_detect_int, |
188 | IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, | ||
188 | "MMC/SD card detect", data); | 189 | "MMC/SD card detect", data); |
189 | if (err) { | 190 | if (err) |
190 | printk(KERN_ERR "tosa_mci_init: MMC/SD: can't request MMC card detect IRQ\n"); | 191 | printk(KERN_ERR "tosa_mci_init: MMC/SD: can't request MMC card detect IRQ\n"); |
191 | return -1; | ||
192 | } | ||
193 | |||
194 | set_irq_type(TOSA_IRQ_GPIO_nSD_DETECT, IRQT_BOTHEDGE); | ||
195 | 192 | ||
196 | return 0; | 193 | return err; |
197 | } | 194 | } |
198 | 195 | ||
199 | static void tosa_mci_setpower(struct device *dev, unsigned int vdd) | 196 | static void tosa_mci_setpower(struct device *dev, unsigned int vdd) |