diff options
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/irq.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 26a95a642ad7..3b1ad1d981a3 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -206,7 +206,8 @@ static int h4_transceiver_mode(struct device *dev, int mode) | |||
206 | 206 | ||
207 | cancel_delayed_work(&irda_config->gpio_expa); | 207 | cancel_delayed_work(&irda_config->gpio_expa); |
208 | PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode); | 208 | PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode); |
209 | schedule_work(&irda_config->gpio_expa); | 209 | #error this is not permitted - mode is an argument variable |
210 | schedule_delayed_work(&irda_config->gpio_expa, 0); | ||
210 | 211 | ||
211 | return 0; | 212 | return 0; |
212 | } | 213 | } |
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 11870093d7a1..a39d30680300 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
@@ -130,7 +130,7 @@ void __init omap_init_irq(void) | |||
130 | 130 | ||
131 | for (i = 0; i < nr_irqs; i++) { | 131 | for (i = 0; i < nr_irqs; i++) { |
132 | set_irq_chip(i, &omap_irq_chip); | 132 | set_irq_chip(i, &omap_irq_chip); |
133 | set_irq_handler(i, do_level_IRQ); | 133 | set_irq_handler(i, handle_level_irq); |
134 | set_irq_flags(i, IRQF_VALID); | 134 | set_irq_flags(i, IRQF_VALID); |
135 | } | 135 | } |
136 | } | 136 | } |