Merge tag 'linux-kselftest-kunit-5.15-rc1' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / arch / parisc / kernel / pdc_cons.c

diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c
index 650cb01..2661cdd 100644 (file)
--- a/arch/parisc/kernel/pdc_cons.c
+++ b/arch/parisc/kernel/pdc_cons.c
@@ -161,9 +161,10 @@ static int __init pdc_console_tty_driver_init(void)
        printk(KERN_INFO "The PDC console driver is still registered, removing CON_BOOT flag\n");
        pdc_cons.flags &= ~CON_BOOT;
 
-       driver = alloc_tty_driver(1);
-       if (!driver)
-               return -ENOMEM;
+       driver = tty_alloc_driver(1, TTY_DRIVER_REAL_RAW |
+                       TTY_DRIVER_RESET_TERMIOS);
+       if (IS_ERR(driver))
+               return PTR_ERR(driver);
 
        tty_port_init(&tty_port);
 
@@ -173,8 +174,6 @@ static int __init pdc_console_tty_driver_init(void)
        driver->minor_start = 0;
        driver->type = TTY_DRIVER_TYPE_SYSTEM;
        driver->init_termios = tty_std_termios;
-       driver->flags = TTY_DRIVER_REAL_RAW |
-               TTY_DRIVER_RESET_TERMIOS;
        tty_set_operations(driver, &pdc_console_tty_ops);
        tty_port_link_device(&tty_port, driver, 0);
 
@@ -182,6 +181,7 @@ static int __init pdc_console_tty_driver_init(void)
        if (err) {
                printk(KERN_ERR "Unable to register the PDC console TTY driver\n");
                tty_port_destroy(&tty_port);
+               tty_driver_kref_put(driver);
                return err;
        }