Skip to content

Commit

Permalink
TTY: tty_alloc_driver() returns error pointers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Aug 16, 2012
1 parent 88ed2a6 commit c3a6344
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions drivers/char/pcmcia/synclink_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/char/ttyprintk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions drivers/tty/moxa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions drivers/tty/pty.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -682,15 +682,15 @@ 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 |
TTY_DRIVER_REAL_RAW |
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";
Expand Down

0 comments on commit c3a6344

Please sign in to comment.