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

Commit ed6e5282 authored by Andrew M. Bishop's avatar Andrew M. Bishop Committed by Greg Kroah-Hartman
Browse files

USB: ftdi_sio: Handle FT232RL devices like FT232BM devices 



Handle the FT232RL device type in exactly the same way as FT232BM
devices (FT232RL detection was added around kernel 2.6.20 but not code
for handling it).

Signed-off-by: default avatarAndrew M. Bishop <amb@gedanken.demon.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent eb231054

drivers/usb/serial/ftdi_sio.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1169,7 +1169,9 @@ static void remove_sysfs_attrs(struct usb_serial_port *port) 
	/* XXX see create_sysfs_attrs */

	/* XXX see create_sysfs_attrs */

	if (priv->chip_type != SIO) {

	if (priv->chip_type != SIO) {

		device_remove_file(&port->dev, &dev_attr_event_char);

		device_remove_file(&port->dev, &dev_attr_event_char);

		if (priv->chip_type == FT232BM || priv->chip_type == FT2232C) {

		if (priv->chip_type == FT232BM ||

		    priv->chip_type == FT2232C ||

		    priv->chip_type == FT232RL) {

			device_remove_file(&port->dev, &dev_attr_latency_timer);

			device_remove_file(&port->dev, &dev_attr_latency_timer);

		}

		}

	}

	}
@@ -2102,6 +2104,7 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file) 
	case FT8U232AM:

	case FT8U232AM:

	case FT232BM:

	case FT232BM:

	case FT2232C:

	case FT2232C:

	case FT232RL:

		/* the 8U232AM returns a two byte value (the sio is a 1 byte value) - in the same

		/* the 8U232AM returns a two byte value (the sio is a 1 byte value) - in the same

		   format as the data returned from the in point */

		   format as the data returned from the in point */

		if ((ret = usb_control_msg(port->serial->dev,

		if ((ret = usb_control_msg(port->serial->dev,