Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3a6344a authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88ed2a60

drivers/char/pcmcia/synclink_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/char/ttyprintk.c

+2 −2
Original line number Diff line number Diff line
@@ -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";

drivers/tty/moxa.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/tty/pty.c

+4 −4
Original line number Diff line number Diff line
@@ -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";