From 093d2918d331d10e2ce6dfc293d4477eca667c83 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 6 Apr 2010 14:34:46 -0700
Subject: [PATCH] --- yaml --- r: 189558 b: refs/heads/master c:
 c70c036f04b7b74282477d6a51bbcc8bb8897e03 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/char/amiserial.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a1cdf2cc09c6..40a4e1c0f069 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8557dc71949e80c298ec298b902ac6ebbc5d9dd
+refs/heads/master: c70c036f04b7b74282477d6a51bbcc8bb8897e03
diff --git a/trunk/drivers/char/amiserial.c b/trunk/drivers/char/amiserial.c
index 6c32fbf07164..56b27671adc4 100644
--- a/trunk/drivers/char/amiserial.c
+++ b/trunk/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();