Skip to content

L
linux
Commit 925971b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Fix moxa compile (at least for UP) and remove a few warnings. 

From Adrian Bunk.
parent 0dddcf52
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
drivers/char/moxa.c
View file @ 925971b6
...@@ -339,7 +339,6 @@ int moxa_init(void) ...@@ -339,7 +339,6 @@ int moxa_init(void)
{ {
int i, n, numBoards; int i, n, numBoards;
struct moxa_str *ch; struct moxa_str *ch;
int ret1, ret2;
printk(KERN_INFO "MOXA Intellio family driver version %s\n", MOXA_VERSION); printk(KERN_INFO "MOXA Intellio family driver version %s\n", MOXA_VERSION);
moxaDriver = alloc_tty_driver(MAX_PORTS + 1); moxaDriver = alloc_tty_driver(MAX_PORTS + 1);
...@@ -615,7 +614,7 @@ static void moxa_close(struct tty_struct *tty, struct file *filp) ...@@ -615,7 +614,7 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
} }
ch->asyncflags |= ASYNC_CLOSING; ch->asyncflags |= ASYNC_CLOSING;
ch->cflag = *tty->termios->c_cflag; ch->cflag = tty->termios->c_cflag;
if (ch->asyncflags & ASYNC_INITIALIZED) { if (ch->asyncflags & ASYNC_INITIALIZED) {
setup_empty_event(tty); setup_empty_event(tty);
tty_wait_until_sent(tty, 30 * HZ); /* 30 seconds timeout */ tty_wait_until_sent(tty, 30 * HZ); /* 30 seconds timeout */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7