Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

[u-boot] / lib_m68k / interrupts.c

diff --git a/lib_m68k/interrupts.c b/lib_m68k/interrupts.c
index 8919c0e8cba36ee9b283e5ef91ae59bd053de348..133494f6dcc3268ed8e62d1924570cefbf656e9c 100644 (file)
--- a/lib_m68k/interrupts.c
+++ b/lib_m68k/interrupts.c
@@ -29,7 +29,7 @@
 #include <asm/processor.h>
 #include <asm/immap.h>
 
-#define        NR_IRQS         (CFG_NUM_IRQS)
+#define        NR_IRQS         (CONFIG_SYS_NUM_IRQS)
 
 /*
  * Interrupt vector functions.
@@ -61,7 +61,7 @@ static __inline__ void set_sr (unsigned short sr)
  */
 void irq_install_handler (int vec, interrupt_handler_t * handler, void *arg)
 {
-       if ((vec < 0) || (vec > NR_IRQS)) {
+       if ((vec < 0) || (vec >= NR_IRQS)) {
                printf ("irq_install_handler: wrong interrupt vector %d\n",
                        vec);
                return;
@@ -73,7 +73,7 @@ void irq_install_handler (int vec, interrupt_handler_t * handler, void *arg)
 
 void irq_free_handler (int vec)
 {
-       if ((vec < 0) || (vec > NR_IRQS)) {
+       if ((vec < 0) || (vec >= NR_IRQS)) {
                return;
        }
 
@@ -106,8 +106,6 @@ void int_handler (struct pt_regs *fp)
        vec = (fp->vector >> 2) & 0xff;
        if (vec > 0x40)
                vec -= 0x40;
-       else
-               return;
 
        if (irq_vecs[vec].handler != NULL) {
                irq_vecs[vec].handler (irq_vecs[vec].arg);