diff options
Diffstat (limited to 'arch/arm/mach-omap1/fpga.c')
-rw-r--r-- | arch/arm/mach-omap1/fpga.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 5cfce1636da0..8780e75cdc3d 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
@@ -143,7 +143,7 @@ static struct irq_chip omap_fpga_irq = { | |||
143 | */ | 143 | */ |
144 | void omap1510_fpga_init_irq(void) | 144 | void omap1510_fpga_init_irq(void) |
145 | { | 145 | { |
146 | int i; | 146 | int i, res; |
147 | 147 | ||
148 | __raw_writeb(0, OMAP1510_FPGA_IMR_LO); | 148 | __raw_writeb(0, OMAP1510_FPGA_IMR_LO); |
149 | __raw_writeb(0, OMAP1510_FPGA_IMR_HI); | 149 | __raw_writeb(0, OMAP1510_FPGA_IMR_HI); |
@@ -177,10 +177,12 @@ void omap1510_fpga_init_irq(void) | |||
177 | * NOTE: For general GPIO/MPUIO access and interrupts, please see | 177 | * NOTE: For general GPIO/MPUIO access and interrupts, please see |
178 | * gpio.[ch] | 178 | * gpio.[ch] |
179 | */ | 179 | */ |
180 | gpio_request(13, "FPGA irq"); | 180 | res = gpio_request(13, "FPGA irq"); |
181 | if (res) { | ||
182 | pr_err("%s failed to get gpio\n", __func__); | ||
183 | return; | ||
184 | } | ||
181 | gpio_direction_input(13); | 185 | gpio_direction_input(13); |
182 | set_irq_type(gpio_to_irq(13), IRQ_TYPE_EDGE_RISING); | 186 | set_irq_type(gpio_to_irq(13), IRQ_TYPE_EDGE_RISING); |
183 | set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); | 187 | set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); |
184 | } | 188 | } |
185 | |||
186 | EXPORT_SYMBOL(omap1510_fpga_init_irq); | ||