summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-06-28 12:24:26 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-04 16:25:50 +0800
commit9f510a82588f91ca1d83606fcde730104e70b348 (patch)
treefc05eca8c5349b12cac5c75860a9c0f3166cf4e4
parent1b5c94b7ed5a0037d7327a385967763fa41ba72c (diff)
downloadlinux-3.10-9f510a82588f91ca1d83606fcde730104e70b348.tar.gz
linux-3.10-9f510a82588f91ca1d83606fcde730104e70b348.tar.bz2
linux-3.10-9f510a82588f91ca1d83606fcde730104e70b348.zip
USB: ti_usb_3410_5052: fix dynamic-id matching
commit 1fad56424f5ad3ce4973505a357212b2e2282b3f upstream. The driver failed to take the dynamic ids into account when determining the device type and therefore all devices were detected as 2-port devices when using the dynamic-id interface. Match on the usb-serial-driver field instead of doing redundant id-table searches. Reported-by: Anders Hammarquist <iko@iko.pp.se> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/ti_usb_3410_5052.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index a39a08c1f51..a7492ba5371 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -390,7 +390,7 @@ static int ti_startup(struct usb_serial *serial)
usb_set_serial_data(serial, tdev);
/* determine device type */
- if (usb_match_id(serial->interface, ti_id_table_3410))
+ if (serial->type == &ti_1port_device)
tdev->td_is_3410 = 1;
dbg("%s - device type is %s", __func__,
tdev->td_is_3410 ? "3410" : "5052");