From e677d88a9c993bf9975589fabdfde50abab3579e Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 7 Aug 2012 21:47:40 +0200
Subject: [PATCH] --- yaml --- r: 325647 b: refs/heads/master c:
 536a3440a27f8687090bdf33468b003bc0f810cf h: refs/heads/master i:   325645:
 8844d7fdd0c52100cbbc2e127aa50838601cf489   325643:
 7eb93ce628d167180eac783bc5020beeb27644ae   325639:
 3034866180984265259040d96b6d6b13e2637ee6   325631:
 5c660b610b258c62739e58ceb18d238d19932b36 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/char/ttyprintk.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cb4398cff924..1f999a7064d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee8b593affdf893012e57f4c54a21984d1b0d92e
+refs/heads/master: 536a3440a27f8687090bdf33468b003bc0f810cf
diff --git a/trunk/drivers/char/ttyprintk.c b/trunk/drivers/char/ttyprintk.c
index 08755c52fc5f..be1c3fb186c1 100644
--- a/trunk/drivers/char/ttyprintk.c
+++ b/trunk/drivers/char/ttyprintk.c
@@ -180,6 +180,10 @@ static int __init ttyprintk_init(void)
 	int ret = -ENOMEM;
 	void *rp;
 
+	tty_port_init(&tpk_port.port);
+	tpk_port.port.ops = &null_ops;
+	mutex_init(&tpk_port.port_write_mutex);
+
 	ttyprintk_driver = alloc_tty_driver(1);
 	if (!ttyprintk_driver)
 		return ret;
@@ -210,10 +214,6 @@ static int __init ttyprintk_init(void)
 		goto error;
 	}
 
-	tty_port_init(&tpk_port.port);
-	tpk_port.port.ops = &null_ops;
-	mutex_init(&tpk_port.port_write_mutex);
-
 	return 0;
 
 error: