diff --git a/[refs] b/[refs]
index aa0ffd62b88c..29e34780c037 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38daf88ae16d053cffc8745e05b9f7a324ce36eb
+refs/heads/master: f06fb543c1d0cbd721250b72ee1244178a38aa9d
diff --git a/trunk/drivers/char/ttyprintk.c b/trunk/drivers/char/ttyprintk.c
index 46b77ede84c0..9b1e5e0cdc65 100644
--- a/trunk/drivers/char/ttyprintk.c
+++ b/trunk/drivers/char/ttyprintk.c
@@ -217,6 +217,7 @@ static int __init ttyprintk_init(void)
 	return 0;
 
 error:
+	tty_unregister_driver(ttyprintk_driver);
 	put_tty_driver(ttyprintk_driver);
 	ttyprintk_driver = NULL;
 	return ret;