diff options
author | Andrew Morton <akpm@osdl.org> | 2006-12-08 05:38:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:55 -0500 |
commit | 95a7b8b9a6453de2c52e469d1afdef80ca4607ae (patch) | |
tree | 393899c2f98d685c5c07e679e039187a0227b50b | |
parent | e930790d2b2ed2166e68858f0068e629bfcf5c33 (diff) |
[PATCH] mxser-workqueue-fixes
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/char/mxser_new.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c index 4555d5973318..369d2742d6be 100644 --- a/drivers/char/mxser_new.c +++ b/drivers/char/mxser_new.c | |||
@@ -358,9 +358,9 @@ static void process_txrx_fifo(struct mxser_port *info) | |||
358 | } | 358 | } |
359 | } | 359 | } |
360 | 360 | ||
361 | static void mxser_do_softint(void *private_) | 361 | static void mxser_do_softint(struct work_struct *work) |
362 | { | 362 | { |
363 | struct mxser_port *info = private_; | 363 | struct mxser_port *info = container_of(work, struct mxser_port, tqueue); |
364 | struct tty_struct *tty = info->tty; | 364 | struct tty_struct *tty = info->tty; |
365 | 365 | ||
366 | if (test_and_clear_bit(MXSER_EVENT_TXLOW, &info->event)) | 366 | if (test_and_clear_bit(MXSER_EVENT_TXLOW, &info->event)) |
@@ -2416,7 +2416,7 @@ static int __devinit mxser_initbrd(struct mxser_board *brd, | |||
2416 | info->custom_divisor = info->baud_base * 16; | 2416 | info->custom_divisor = info->baud_base * 16; |
2417 | info->close_delay = 5 * HZ / 10; | 2417 | info->close_delay = 5 * HZ / 10; |
2418 | info->closing_wait = 30 * HZ; | 2418 | info->closing_wait = 30 * HZ; |
2419 | INIT_WORK(&info->tqueue, mxser_do_softint, info); | 2419 | INIT_WORK(&info->tqueue, mxser_do_softint); |
2420 | info->normal_termios = mxvar_sdriver->init_termios; | 2420 | info->normal_termios = mxvar_sdriver->init_termios; |
2421 | init_waitqueue_head(&info->open_wait); | 2421 | init_waitqueue_head(&info->open_wait); |
2422 | init_waitqueue_head(&info->close_wait); | 2422 | init_waitqueue_head(&info->close_wait); |