diff --git a/[refs] b/[refs]
index 046e21d1dbbf..d3f76e2aa850 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c70555b051f2a32bf94a7e1c75b6b6759031b989
+refs/heads/master: 3abf3beda75a10988eab4c1deab893e2d38e643e
diff --git a/trunk/drivers/char/amiserial.c b/trunk/drivers/char/amiserial.c
index 39880eb58f35..0e2b72f2b887 100644
--- a/trunk/drivers/char/amiserial.c
+++ b/trunk/drivers/char/amiserial.c
@@ -902,8 +902,7 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count
 	if (!info->xmit.buf)
 		return 0;
 
-	local_save_flags(flags);
-	local_irq_disable();
+	local_irq_save(flags);
 	while (1) {
 		c = CIRC_SPACE_TO_END(info->xmit.head,
 				      info->xmit.tail,