4 files changed, 10 insertions, 10 deletions

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index d9335ae1fadf..5db08c78beb5 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2813,8 +2813,8 @@ static int __init synclink_cs_init(void)
         serial_driver = tty_alloc_driver(MAX_DEVICE_COUNT,
                         TTY_DRIVER_REAL_RAW |
                         TTY_DRIVER_DYNAMIC_DEV);
-        if (!serial_driver) {
-                rc = -ENOMEM;
+        if (IS_ERR(serial_driver)) {
+                rc = PTR_ERR(serial_driver);
                 goto err;
         }
 
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index 561f8aa7cd87..af98f6d6509b 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -187,8 +187,8 @@ static int __init ttyprintk_init(void)
                         TTY_DRIVER_RESET_TERMIOS |
                         TTY_DRIVER_REAL_RAW |
                         TTY_DRIVER_UNNUMBERED_NODE);
-        if (!ttyprintk_driver)
-                return ret;
+        if (IS_ERR(ttyprintk_driver))
+                return PTR_ERR(ttyprintk_driver);
 
         ttyprintk_driver->driver_name = "ttyprintk";
         ttyprintk_driver->name = "ttyprintk";
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 3b17a044c212..56e616b9109a 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -1048,8 +1048,8 @@ static int __init moxa_init(void)
         moxaDriver = tty_alloc_driver(MAX_PORTS + 1,
                         TTY_DRIVER_REAL_RAW |
                         TTY_DRIVER_DYNAMIC_DEV);
-        if (!moxaDriver)
-                return -ENOMEM;
+        if (IS_ERR(moxaDriver))
+                return PTR_ERR(moxaDriver);
 
         moxaDriver->name = "ttyMX";
         moxaDriver->major = ttymajor;
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index f5a27c66ff60..2bace847eb39 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -448,14 +448,14 @@ static void __init legacy_pty_init(void)
                         TTY_DRIVER_RESET_TERMIOS |
                         TTY_DRIVER_REAL_RAW |
                         TTY_DRIVER_DYNAMIC_ALLOC);
-        if (!pty_driver)
+        if (IS_ERR(pty_driver))
                 panic("Couldn't allocate pty driver");
 
         pty_slave_driver = tty_alloc_driver(legacy_count,
                         TTY_DRIVER_RESET_TERMIOS |
                         TTY_DRIVER_REAL_RAW |
                         TTY_DRIVER_DYNAMIC_ALLOC);
-        if (!pty_slave_driver)
+        if (IS_ERR(pty_slave_driver))
                 panic("Couldn't allocate pty slave driver");
 
         pty_driver->driver_name = "pty_master";
@@ -682,7 +682,7 @@ static void __init unix98_pty_init(void)
                         TTY_DRIVER_DYNAMIC_DEV |
                         TTY_DRIVER_DEVPTS_MEM |
                         TTY_DRIVER_DYNAMIC_ALLOC);
-        if (!ptm_driver)
+        if (IS_ERR(ptm_driver))
                 panic("Couldn't allocate Unix98 ptm driver");
         pts_driver = tty_alloc_driver(NR_UNIX98_PTY_MAX,
                         TTY_DRIVER_RESET_TERMIOS |
@@ -690,7 +690,7 @@ static void __init unix98_pty_init(void)
                         TTY_DRIVER_DYNAMIC_DEV |
                         TTY_DRIVER_DEVPTS_MEM |
                         TTY_DRIVER_DYNAMIC_ALLOC);
-        if (!pts_driver)
+        if (IS_ERR(pts_driver))
                 panic("Couldn't allocate Unix98 pts driver");
 
         ptm_driver->driver_name = "pty_master";