]> err.no Git - linux-2.6/commitdiff
[PATCH] CHAR-Amiserial: turn local_save_flags() + local_irq_disable() into local_irq_...
authorJiri Kosina <jkosina@suse.cz>
Sat, 10 Feb 2007 09:46:48 +0000 (01:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 11 Feb 2007 19:18:07 +0000 (11:18 -0800)
drivers/char/amiserial.c::rs_write() contains local_irq_disable() after
local_save_flags().  Turn it into local_irq_save().

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/amiserial.c

index 39880eb58f356810a0861ed732de0c5fd2e1a1c4..0e2b72f2b8871d96f124581bba1ee724c2f936c0 100644 (file)
@@ -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,