diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2007-02-10 04:46:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:18:07 -0500 |
| commit | 3abf3beda75a10988eab4c1deab893e2d38e643e (patch) | |
| tree | ba5c4e6940021c68d81236e5d48a07eda27b69c6 | |
| parent | c70555b051f2a32bf94a7e1c75b6b6759031b989 (diff) | |
[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>
| -rw-r--r-- | drivers/char/amiserial.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 39880eb58f35..0e2b72f2b887 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 | |||
| 902 | if (!info->xmit.buf) | 902 | if (!info->xmit.buf) |
| 903 | return 0; | 903 | return 0; |
| 904 | 904 | ||
| 905 | local_save_flags(flags); | 905 | local_irq_save(flags); |
| 906 | local_irq_disable(); | ||
| 907 | while (1) { | 906 | while (1) { |
| 908 | c = CIRC_SPACE_TO_END(info->xmit.head, | 907 | c = CIRC_SPACE_TO_END(info->xmit.head, |
| 909 | info->xmit.tail, | 908 | info->xmit.tail, |