Commit 3b009c63 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

USB: fix usb-serial/ftdi build warning

Fix annoying build warning:

drivers/usb/serial/ftdi_sio.c:890: warning: enumeration value `FT232RL' not handled in switch

Also add logic to detect FT232R chips (version 6.00, usb 2.0 full speed),
so that case isn't completely useless.  (NOTE:  FT232RL and FT232RQ are
the same chip in different packages:  L is SSOP, Q is QFN.)
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b46d60fc
...@@ -879,6 +879,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port) ...@@ -879,6 +879,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
break; break;
case FT232BM: /* FT232BM chip */ case FT232BM: /* FT232BM chip */
case FT2232C: /* FT2232C chip */ case FT2232C: /* FT2232C chip */
case FT232RL:
if (baud <= 3000000) { if (baud <= 3000000) {
div_value = ftdi_232bm_baud_to_divisor(baud); div_value = ftdi_232bm_baud_to_divisor(baud);
} else { } else {
...@@ -1021,9 +1022,12 @@ static void ftdi_determine_type(struct usb_serial_port *port) ...@@ -1021,9 +1022,12 @@ static void ftdi_determine_type(struct usb_serial_port *port)
/* (It might be a BM because of the iSerialNumber bug, /* (It might be a BM because of the iSerialNumber bug,
* but it will still work as an AM device.) */ * but it will still work as an AM device.) */
priv->chip_type = FT8U232AM; priv->chip_type = FT8U232AM;
} else { } else if (version < 0x600) {
/* Assume its an FT232BM (or FT245BM) */ /* Assume its an FT232BM (or FT245BM) */
priv->chip_type = FT232BM; priv->chip_type = FT232BM;
} else {
/* Assume its an FT232R */
priv->chip_type = FT232RL;
} }
info("Detected %s", ftdi_chip_name[priv->chip_type]); info("Detected %s", ftdi_chip_name[priv->chip_type]);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment