Merge tag 'fscache-next-20210829' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / alpha / kernel / srmcons.c

diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
index fc03471..90635ef 100644 (file)
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -204,9 +204,9 @@ srmcons_init(void)
                struct tty_driver *driver;
                int err;
 
-               driver = alloc_tty_driver(MAX_SRM_CONSOLE_DEVICES);
-               if (!driver)
-                       return -ENOMEM;
+               driver = tty_alloc_driver(MAX_SRM_CONSOLE_DEVICES, 0);
+               if (IS_ERR(driver))
+                       return PTR_ERR(driver);
 
                tty_port_init(&srmcons_singleton.port);
 
@@ -221,7 +221,7 @@ srmcons_init(void)
                tty_port_link_device(&srmcons_singleton.port, driver, 0);
                err = tty_register_driver(driver);
                if (err) {
-                       put_tty_driver(driver);
+                       tty_driver_kref_put(driver);
                        tty_port_destroy(&srmcons_singleton.port);
                        return err;
                }