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@xxxxxxxxxxxxxxx>
---
Simply changing altsetting to cur_altsetting would have caused the
offending line to exceed the 80 character limit. Instead I changed
the code structure to be the same as in Johan's recent JTAG quirk
cleanup patch.
---
drivers/usb/serial/ftdi_sio.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 12a4b74ca1f4..a34c0d8b0cd3 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -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,14 +1587,13 @@ 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
--
2.9.0
