---

yaml --- r: 43679 b: refs/heads/master c: 95a7b8b h: refs/heads/master i: 43677: 45c5881 43675: 07a01b2 43671: 252361c 43663: 8e61470 43647: f6df9bc v: v3
git-mirror · Dec 8, 2006 · 9df5057 · 9df5057
1 parent 7b0a7aa
commit 9df5057
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e930790d2b2ed2166e68858f0068e629bfcf5c33
+refs/heads/master: 95a7b8b9a6453de2c52e469d1afdef80ca4607ae
diff --git a/trunk/drivers/char/mxser_new.c b/trunk/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);