USB: serial: ftdi_sio: use cur_altsetting for consistency (711a3781) · Commits · 戴 / test

ftdi_determine_type() function had this construct in it to get the number of the interface it is operating on: inter = serial->interface->altsetting->desc.bInterfaceNumber; Elsewhere in this driver cur_altsetting is used instead for this purpose. Change ftdi_determine_type() to use cur_altsetting for consistency. Signed-off-by:

Mychaela N. Falconia <falcon@freecalypso.org> [ johan: fix old style issues; drop braces and random white space ] Signed-off-by:

Johan Hovold <johan@kernel.org>

drivers/usb/serial/ftdi_sio.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -1571,7 +1571,8 @@ static void ftdi_determine_type(struct usb_serial_port *port)
		dev_dbg(&port->dev, "%s: bcdDevice = 0x%x, bNumInterfaces = %u\n", __func__,
		version, interfaces);
		if (interfaces > 1) {
		int inter;
		struct usb_interface *intf = serial->interface;
		int ifnum = intf->cur_altsetting->desc.bInterfaceNumber;

		/* Multiple interfaces.*/
		if (version == 0x0800) {
		@@ -1586,16 +1587,15 @@ static void ftdi_determine_type(struct usb_serial_port *port)
		priv->chip_type = FT2232C;

		/* Determine interface code. */
		inter = serial->interface->altsetting->desc.bInterfaceNumber;
		if (inter == 0) {
		if (ifnum == 0)
		priv->interface = INTERFACE_A;
		} else if (inter == 1) {
		else if (ifnum == 1)
		priv->interface = INTERFACE_B;
		} else if (inter == 2) {
		else if (ifnum == 2)
		priv->interface = INTERFACE_C;
		} else if (inter == 3) {
		else if (ifnum == 3)
		priv->interface = INTERFACE_D;
		}

		/* BM-type devices have a bug where bcdDevice gets set
		* to 0x200 when iSerialNumber is 0. */
		if (version < 0x500) {

Admin message