diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-12-08 02:38:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:28:55 -0800 |
| commit | 95a7b8b9a6453de2c52e469d1afdef80ca4607ae (patch) | |
| tree | 393899c2f98d685c5c07e679e039187a0227b50b /drivers/char/mxser_new.c | |
| parent | e930790d2b2ed2166e68858f0068e629bfcf5c33 (diff) | |
| download | talos-obmc-linux-95a7b8b9a6453de2c52e469d1afdef80ca4607ae.tar.gz talos-obmc-linux-95a7b8b9a6453de2c52e469d1afdef80ca4607ae.zip | |
[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>
Diffstat (limited to 'drivers/char/mxser_new.c')
| -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) } } -static void mxser_do_softint(void *private_) +static void mxser_do_softint(struct work_struct *work) { - struct mxser_port *info = private_; + struct mxser_port *info = container_of(work, struct mxser_port, tqueue); struct tty_struct *tty = info->tty; if (test_and_clear_bit(MXSER_EVENT_TXLOW, &info->event)) @@ -2416,7 +2416,7 @@ static int __devinit mxser_initbrd(struct mxser_board *brd, info->custom_divisor = info->baud_base * 16; info->close_delay = 5 * HZ / 10; info->closing_wait = 30 * HZ; - INIT_WORK(&info->tqueue, mxser_do_softint, info); + INIT_WORK(&info->tqueue, mxser_do_softint); info->normal_termios = mxvar_sdriver->init_termios; init_waitqueue_head(&info->open_wait); init_waitqueue_head(&info->close_wait); |
