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

Commit 318dc9ce authored by Johan Hovold's avatar Johan Hovold Committed by Sasha Levin
Browse files

USB: serial: fix tty-device error handling at probe 



commit ca4383a3947a83286bc9b9c598a1f55e867871d7 upstream.

Add missing error handling when registering the tty device at port
probe. This avoids trying to remove an uninitialised character device
when the port device is removed.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Reported-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent acc69639

drivers/usb/serial/bus.c

+10 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static int usb_serial_device_probe(struct device *dev) 
{

	struct usb_serial_driver *driver;

	struct usb_serial_port *port;

	struct device *tty_dev;

	int retval = 0;

	int minor;
@@ -80,7 +81,15 @@ static int usb_serial_device_probe(struct device *dev) 
	}



	minor = port->minor;

	tty_register_device(usb_serial_tty_driver, minor, dev);

	tty_dev = tty_register_device(usb_serial_tty_driver, minor, dev);

	if (IS_ERR(tty_dev)) {

		retval = PTR_ERR(tty_dev);

		device_remove_file(dev, &dev_attr_port_number);

		if (driver->port_remove)

			driver->port_remove(port);

		goto exit_with_autopm;

	}



	dev_info(&port->serial->dev->dev,

		 "%s converter now attached to ttyUSB%d\n",

		 driver->description, minor);