TTY: tty_alloc_driver() returns error pointers
We changed these from alloc_tty_driver() to tty_alloc_driver() so the error handling needs to modified to check for IS_ERR() instead of NULL. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
88ed2a6061
commit
c3a6344ae4
|
@ -2813,8 +2813,8 @@ static int __init synclink_cs_init(void)
|
||||||
serial_driver = tty_alloc_driver(MAX_DEVICE_COUNT,
|
serial_driver = tty_alloc_driver(MAX_DEVICE_COUNT,
|
||||||
TTY_DRIVER_REAL_RAW |
|
TTY_DRIVER_REAL_RAW |
|
||||||
TTY_DRIVER_DYNAMIC_DEV);
|
TTY_DRIVER_DYNAMIC_DEV);
|
||||||
if (!serial_driver) {
|
if (IS_ERR(serial_driver)) {
|
||||||
rc = -ENOMEM;
|
rc = PTR_ERR(serial_driver);
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -187,8 +187,8 @@ static int __init ttyprintk_init(void)
|
||||||
TTY_DRIVER_RESET_TERMIOS |
|
TTY_DRIVER_RESET_TERMIOS |
|
||||||
TTY_DRIVER_REAL_RAW |
|
TTY_DRIVER_REAL_RAW |
|
||||||
TTY_DRIVER_UNNUMBERED_NODE);
|
TTY_DRIVER_UNNUMBERED_NODE);
|
||||||
if (!ttyprintk_driver)
|
if (IS_ERR(ttyprintk_driver))
|
||||||
return ret;
|
return PTR_ERR(ttyprintk_driver);
|
||||||
|
|
||||||
ttyprintk_driver->driver_name = "ttyprintk";
|
ttyprintk_driver->driver_name = "ttyprintk";
|
||||||
ttyprintk_driver->name = "ttyprintk";
|
ttyprintk_driver->name = "ttyprintk";
|
||||||
|
|
|
@ -1048,8 +1048,8 @@ static int __init moxa_init(void)
|
||||||
moxaDriver = tty_alloc_driver(MAX_PORTS + 1,
|
moxaDriver = tty_alloc_driver(MAX_PORTS + 1,
|
||||||
TTY_DRIVER_REAL_RAW |
|
TTY_DRIVER_REAL_RAW |
|
||||||
TTY_DRIVER_DYNAMIC_DEV);
|
TTY_DRIVER_DYNAMIC_DEV);
|
||||||
if (!moxaDriver)
|
if (IS_ERR(moxaDriver))
|
||||||
return -ENOMEM;
|
return PTR_ERR(moxaDriver);
|
||||||
|
|
||||||
moxaDriver->name = "ttyMX";
|
moxaDriver->name = "ttyMX";
|
||||||
moxaDriver->major = ttymajor;
|
moxaDriver->major = ttymajor;
|
||||||
|
|
|
@ -448,14 +448,14 @@ static void __init legacy_pty_init(void)
|
||||||
TTY_DRIVER_RESET_TERMIOS |
|
TTY_DRIVER_RESET_TERMIOS |
|
||||||
TTY_DRIVER_REAL_RAW |
|
TTY_DRIVER_REAL_RAW |
|
||||||
TTY_DRIVER_DYNAMIC_ALLOC);
|
TTY_DRIVER_DYNAMIC_ALLOC);
|
||||||
if (!pty_driver)
|
if (IS_ERR(pty_driver))
|
||||||
panic("Couldn't allocate pty driver");
|
panic("Couldn't allocate pty driver");
|
||||||
|
|
||||||
pty_slave_driver = tty_alloc_driver(legacy_count,
|
pty_slave_driver = tty_alloc_driver(legacy_count,
|
||||||
TTY_DRIVER_RESET_TERMIOS |
|
TTY_DRIVER_RESET_TERMIOS |
|
||||||
TTY_DRIVER_REAL_RAW |
|
TTY_DRIVER_REAL_RAW |
|
||||||
TTY_DRIVER_DYNAMIC_ALLOC);
|
TTY_DRIVER_DYNAMIC_ALLOC);
|
||||||
if (!pty_slave_driver)
|
if (IS_ERR(pty_slave_driver))
|
||||||
panic("Couldn't allocate pty slave driver");
|
panic("Couldn't allocate pty slave driver");
|
||||||
|
|
||||||
pty_driver->driver_name = "pty_master";
|
pty_driver->driver_name = "pty_master";
|
||||||
|
@ -682,7 +682,7 @@ static void __init unix98_pty_init(void)
|
||||||
TTY_DRIVER_DYNAMIC_DEV |
|
TTY_DRIVER_DYNAMIC_DEV |
|
||||||
TTY_DRIVER_DEVPTS_MEM |
|
TTY_DRIVER_DEVPTS_MEM |
|
||||||
TTY_DRIVER_DYNAMIC_ALLOC);
|
TTY_DRIVER_DYNAMIC_ALLOC);
|
||||||
if (!ptm_driver)
|
if (IS_ERR(ptm_driver))
|
||||||
panic("Couldn't allocate Unix98 ptm driver");
|
panic("Couldn't allocate Unix98 ptm driver");
|
||||||
pts_driver = tty_alloc_driver(NR_UNIX98_PTY_MAX,
|
pts_driver = tty_alloc_driver(NR_UNIX98_PTY_MAX,
|
||||||
TTY_DRIVER_RESET_TERMIOS |
|
TTY_DRIVER_RESET_TERMIOS |
|
||||||
|
@ -690,7 +690,7 @@ static void __init unix98_pty_init(void)
|
||||||
TTY_DRIVER_DYNAMIC_DEV |
|
TTY_DRIVER_DYNAMIC_DEV |
|
||||||
TTY_DRIVER_DEVPTS_MEM |
|
TTY_DRIVER_DEVPTS_MEM |
|
||||||
TTY_DRIVER_DYNAMIC_ALLOC);
|
TTY_DRIVER_DYNAMIC_ALLOC);
|
||||||
if (!pts_driver)
|
if (IS_ERR(pts_driver))
|
||||||
panic("Couldn't allocate Unix98 pts driver");
|
panic("Couldn't allocate Unix98 pts driver");
|
||||||
|
|
||||||
ptm_driver->driver_name = "pty_master";
|
ptm_driver->driver_name = "pty_master";
|
||||||
|
|
Loading…
Reference in a new issue