From 8b8e1bd285f98905e9e054a6e5ebc4580b43d956 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Thu, 23 Jun 2011 13:39:00 +0100 Subject: [PATCH] --- yaml --- r: 253966 b: refs/heads/master c: 33b1e6939f5c37ab8e64280fd3d54046607b5c80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/mrst_max3110.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 072f77a930d0..271b3b4f6ad7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bb04bf3dfdfe1c981087cdfb0d9d772c3a0ba55 +refs/heads/master: 33b1e6939f5c37ab8e64280fd3d54046607b5c80 diff --git a/trunk/drivers/tty/serial/mrst_max3110.c b/trunk/drivers/tty/serial/mrst_max3110.c index 3be1b0dd6f22..a764bf99743b 100644 --- a/trunk/drivers/tty/serial/mrst_max3110.c +++ b/trunk/drivers/tty/serial/mrst_max3110.c @@ -421,7 +421,6 @@ static int max3110_main_thread(void *_max) int ret = 0; struct circ_buf *xmit = &max->con_xmit; - init_waitqueue_head(wq); pr_info(PR_FMT "start main thread\n"); do { @@ -838,6 +837,8 @@ static int __devinit serial_m3110_probe(struct spi_device *spi) max->con_xmit.head = 0; max->con_xmit.tail = 0; + init_waitqueue_head(&max->wq); + max->main_thread = kthread_run(max3110_main_thread, max, "max3110_main"); if (IS_ERR(max->main_thread)) {