diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-04-02 08:45:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-16 17:21:06 -0400 |
commit | 7d1c2858c49095ab748f55354b89dbd6b18d28b9 (patch) | |
tree | 7775cf89d57cb642315ec515cb1111c56c6b08c7 | |
parent | f4f653e9875e573860e783fecbebde284a8626f5 (diff) |
ttyprintk: Fix wrong tty_unregister_driver() call in the error path
ttyprintk driver calls tty_unregister_driver() wrongly in the error
path of tty_register_driver(). Also, setting ttyprintk_driver to NULL
is utterly superfluous, so let's get rid of it, too.
Reported-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/char/ttyprintk.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c index daea84c41743..2a39c5790364 100644 --- a/drivers/char/ttyprintk.c +++ b/drivers/char/ttyprintk.c | |||
@@ -210,10 +210,8 @@ static int __init ttyprintk_init(void) | |||
210 | return 0; | 210 | return 0; |
211 | 211 | ||
212 | error: | 212 | error: |
213 | tty_unregister_driver(ttyprintk_driver); | ||
214 | put_tty_driver(ttyprintk_driver); | 213 | put_tty_driver(ttyprintk_driver); |
215 | tty_port_destroy(&tpk_port.port); | 214 | tty_port_destroy(&tpk_port.port); |
216 | ttyprintk_driver = NULL; | ||
217 | return ret; | 215 | return ret; |
218 | } | 216 | } |
219 | device_initcall(ttyprintk_init); | 217 | device_initcall(ttyprintk_init); |