diff options
author | Ilya Zykov <ilya@ilyx.ru> | 2011-11-07 02:32:46 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-30 07:30:49 -0500 |
commit | 7962fce9a052f34390b6dab9f11df1d2e48c138d (patch) | |
tree | 7df7a368eaf518dd91febe35a2fb0ea7a84b6416 /drivers/tty/n_hdlc.c | |
parent | c8381c15b14b7c2d212c182d3b9b3fa7217994da (diff) |
tty: n_hdlc not atomic use tty->flags.
N_HDLC can spoil tty->flags because use not atomic operations on tty->flags.
I use n_hdlc line discipline and it happens.
Signed-off-by: Ilya Zykov <ilya@ilyx.ru>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/n_hdlc.c')
-rw-r--r-- | drivers/tty/n_hdlc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c index cea56033b34c..a09ce3ef5d74 100644 --- a/drivers/tty/n_hdlc.c +++ b/drivers/tty/n_hdlc.c | |||
@@ -417,7 +417,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty) | |||
417 | __FILE__,__LINE__,tbuf,tbuf->count); | 417 | __FILE__,__LINE__,tbuf,tbuf->count); |
418 | 418 | ||
419 | /* Send the next block of data to device */ | 419 | /* Send the next block of data to device */ |
420 | tty->flags |= (1 << TTY_DO_WRITE_WAKEUP); | 420 | set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); |
421 | actual = tty->ops->write(tty, tbuf->buf, tbuf->count); | 421 | actual = tty->ops->write(tty, tbuf->buf, tbuf->count); |
422 | 422 | ||
423 | /* rollback was possible and has been done */ | 423 | /* rollback was possible and has been done */ |
@@ -459,7 +459,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty) | |||
459 | } | 459 | } |
460 | 460 | ||
461 | if (!tbuf) | 461 | if (!tbuf) |
462 | tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP); | 462 | clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); |
463 | 463 | ||
464 | /* Clear the re-entry flag */ | 464 | /* Clear the re-entry flag */ |
465 | spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags); | 465 | spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags); |
@@ -491,7 +491,7 @@ static void n_hdlc_tty_wakeup(struct tty_struct *tty) | |||
491 | return; | 491 | return; |
492 | 492 | ||
493 | if (tty != n_hdlc->tty) { | 493 | if (tty != n_hdlc->tty) { |
494 | tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP); | 494 | clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); |
495 | return; | 495 | return; |
496 | } | 496 | } |
497 | 497 | ||