From f1c757f0ce301ecdf992f3d7b6233a9101de9749 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Fri, 10 May 2013 15:40:13 -0700 Subject: [PATCH] --- yaml --- r: 376023 b: refs/heads/master c: b5325a02aa84c794cf520d6d68cae4b150988a32 h: refs/heads/master i: 376021: 2c20edbce3c9e9e0084cfcd8babcb9964519f7a9 376019: 6e1bd0108198b9e0f56d1bb09f853cbccc4fda7b 376015: a878a66e05c0ceecd5b95018fb23a5bf9dbc4ca9 v: v3 --- [refs] | 2 +- trunk/drivers/char/ttyprintk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f312323f098e..15a32d7ebd35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89fb9e7c3423662f4969a1e8ef0f5d44835d2381 +refs/heads/master: b5325a02aa84c794cf520d6d68cae4b150988a32 diff --git a/trunk/drivers/char/ttyprintk.c b/trunk/drivers/char/ttyprintk.c index 4945bd3d18d0..d5d2e4a985aa 100644 --- a/trunk/drivers/char/ttyprintk.c +++ b/trunk/drivers/char/ttyprintk.c @@ -179,7 +179,6 @@ static int __init ttyprintk_init(void) { int ret = -ENOMEM; - tpk_port.port.ops = &null_ops; mutex_init(&tpk_port.port_write_mutex); ttyprintk_driver = tty_alloc_driver(1, @@ -190,6 +189,7 @@ static int __init ttyprintk_init(void) return PTR_ERR(ttyprintk_driver); tty_port_init(&tpk_port.port); + tpk_port.port.ops = &null_ops; ttyprintk_driver->driver_name = "ttyprintk"; ttyprintk_driver->name = "ttyprintk";