diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 09:53:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 17:29:45 +0200 |
| commit | 978e595f88a1fba5869aa42a4af4fba36f33ecac (patch) | |
| tree | 60848f49949c5b7b518621ee36cdc6d500244539 /drivers/char/rocket.c | |
| parent | drivers/char/ds1286.c: use time_before, time_before_eq, etc (diff) | |
| download | linux-978e595f88a1fba5869aa42a4af4fba36f33ecac.tar.xz linux-978e595f88a1fba5869aa42a4af4fba36f33ecac.zip | |
tty/serial: lay the foundations for the next set of reworks
- Stop drivers calling their own flush method indirectly, it obfuscates code
and it will change soon anyway
- A few more lock_kernel paths temporarily needed in some driver internal
waiting code
- Remove private put_char method that does a write call for one char - we
have that anyway
- Most but not yet all of the termios copy under lock fixing (some has other
dependencies to follow)
- Note a few locking bugs in drivers found in the process
- Kill remaining [ab]users of TIOCG/SSOFTCAR in the driver, these must go to
fix the termios locking
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/rocket.c')
| -rw-r--r-- | drivers/char/rocket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 32fe8dca24b6..00cfb6c7fd46 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -1585,6 +1585,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout) jiffies); printk(KERN_INFO "cps=%d...\n", info->cps); #endif + lock_kernel(); while (1) { txcnt = sGetTxCnt(cp); if (!txcnt) { @@ -1612,6 +1613,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout) break; } __set_current_state(TASK_RUNNING); + unlock_kernel(); #ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT printk(KERN_INFO "txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies); #endif |