From 9df50576495083dc69f65a01b082ef7c58e5ec32 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 8 Dec 2006 02:38:36 -0800
Subject: [PATCH] --- yaml --- r: 43679 b: refs/heads/master c:
 95a7b8b9a6453de2c52e469d1afdef80ca4607ae h: refs/heads/master i:   43677:
 45c5881b3ab00aaef533e94956d5899c9273211e   43675:
 07a01b2cf297c30a4e2621f5dcddaa1772f0ecee   43671:
 252361cdb6e5eb88ee9b2d26b4f3dee689b4a19d   43663:
 8e61470675fc3b9b2146aa09fa0317b80454fc1b   43647:
 f6df9bc307d78ca7504502e0ad8b244458fa15ff v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/char/mxser_new.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a52b69400a79..7bdf415ac8cc 100644
--- 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
index 4555d5973318..369d2742d6be 100644
--- 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);