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

Commit 79ef5189 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: use tty_port_register_device() 



We already have the tty port when probing a usb-serial port so use
tty_port_register_device() directly instead of tty_port_install() later
to set up the port link.

This is a step towards enabling serdev for usb-serial (but we need to
determine how to handle hotplugging first).

Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 4d304a6f

drivers/usb/serial/bus.c

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ static int usb_serial_device_probe(struct device *dev) 
	}



	minor = port->minor;

	tty_dev = tty_register_device(usb_serial_tty_driver, minor, dev);

	tty_dev = tty_port_register_device(&port->port, usb_serial_tty_driver,

					   minor, dev);

	if (IS_ERR(tty_dev)) {

		retval = PTR_ERR(tty_dev);

		goto err_port_remove;

drivers/usb/serial/usb-serial.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty) 
	if (retval)

		goto error_get_interface;



	retval = tty_port_install(&port->port, driver, tty);

	retval = tty_standard_install(driver, tty);

	if (retval)

		goto error_init_termios;