diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 03:53:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:45 -0400 |
commit | 978e595f88a1fba5869aa42a4af4fba36f33ecac (patch) | |
tree | 60848f49949c5b7b518621ee36cdc6d500244539 /drivers/char/moxa.c | |
parent | ac0e4b7d319bf284bb64bc7e1c051417386b34a4 (diff) |
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/moxa.c')
-rw-r--r-- | drivers/char/moxa.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 1ab9517c24c5..585fac179ec6 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c | |||
@@ -1280,6 +1280,7 @@ static int moxa_chars_in_buffer(struct tty_struct *tty) | |||
1280 | */ | 1280 | */ |
1281 | if (ch == NULL) | 1281 | if (ch == NULL) |
1282 | return 0; | 1282 | return 0; |
1283 | lock_kernel(); | ||
1283 | chars = MoxaPortTxQueue(ch); | 1284 | chars = MoxaPortTxQueue(ch); |
1284 | if (chars) { | 1285 | if (chars) { |
1285 | /* | 1286 | /* |
@@ -1289,6 +1290,7 @@ static int moxa_chars_in_buffer(struct tty_struct *tty) | |||
1289 | if (!(ch->statusflags & EMPTYWAIT)) | 1290 | if (!(ch->statusflags & EMPTYWAIT)) |
1290 | moxa_setup_empty_event(tty); | 1291 | moxa_setup_empty_event(tty); |
1291 | } | 1292 | } |
1293 | unlock_kernel(); | ||
1292 | return chars; | 1294 | return chars; |
1293 | } | 1295 | } |
1294 | 1296 | ||