Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 6c32fbf07164..56b27671adc4 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -2021,8 +2021,6 @@ static int __init rs_init(void)
         state->baud_base = amiga_colorclock;
         state->xmit_fifo_size = 1;
 
-        local_irq_save(flags);
-
         /* set ISRs, and then disable the rx interrupts */
         error = request_irq(IRQ_AMIGA_TBE, ser_tx_int, 0, "serial TX", state);
         if (error)
@@ -2033,6 +2031,8 @@ static int __init rs_init(void)
         if (error)
                 goto fail_free_irq;
 
+        local_irq_save(flags);
+
         /* turn off Rx and Tx interrupts */
         custom.intena = IF_RBF | IF_TBE;
         mb();