summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2007-02-10 01:46:48 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 11:18:07 -0800
commit3abf3beda75a10988eab4c1deab893e2d38e643e (patch)
treeba5c4e6940021c68d81236e5d48a07eda27b69c6 /drivers/char
parentc70555b051f2a32bf94a7e1c75b6b6759031b989 (diff)
downloadop-kernel-dev-3abf3beda75a10988eab4c1deab893e2d38e643e.zip
op-kernel-dev-3abf3beda75a10988eab4c1deab893e2d38e643e.tar.gz
[PATCH] CHAR-Amiserial: turn local_save_flags() + local_irq_disable() into local_irq_save()
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/amiserial.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 39880eb..0e2b72f 100644
--- a/drivers/char/amiserial.c
+++ b/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,
OpenPOWER on IntegriCloud