Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[firefly-linux-kernel-4.4.55.git] / drivers / s390 / char / sclp_tty.c

diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 30ec09e3d037c7c25cfb382fd89d7c1c742f038a..877fbc37c1e7986bd588c6bdf6656e08bb584bc3 100644 (file)
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -547,7 +547,6 @@ sclp_tty_init(void)
                sclp_tty_tolower = 1;
        }
        sclp_tty_chars_count = 0;
-       tty_port_init(&sclp_port);
 
        rc = sclp_register(&sclp_input_event);
        if (rc) {
@@ -555,6 +554,8 @@ sclp_tty_init(void)
                return rc;
        }
 
+       tty_port_init(&sclp_port);
+
        driver->driver_name = "sclp_line";
        driver->name = "sclp_line";
        driver->major = TTY_MAJOR;
@@ -571,6 +572,7 @@ sclp_tty_init(void)
        rc = tty_register_driver(driver);
        if (rc) {
                put_tty_driver(driver);
+               tty_port_destroy(&sclp_port);
                return rc;
        }
        sclp_tty_driver = driver;