summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-06-28 12:24:26 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-24 15:55:38 -0700
commit1fad56424f5ad3ce4973505a357212b2e2282b3f (patch)
treeaa874f2aada643de298802bb4206e5c25efcf9ad /drivers/usb
parent94190301ffa059c2d127b3a67ec5d161d5c62681 (diff)
downloadblackbird-op-linux-1fad56424f5ad3ce4973505a357212b2e2282b3f.tar.gz
blackbird-op-linux-1fad56424f5ad3ce4973505a357212b2e2282b3f.zip
USB: ti_usb_3410_5052: fix dynamic-id matching
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> Cc: stable <stable@vger.kernel.org> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-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 7182bb774b79..375b5a400b6f 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -371,7 +371,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;
dev_dbg(&dev->dev, "%s - device type is %s\n", __func__,
tdev->td_is_3410 ? "3410" : "5052");
OpenPOWER on IntegriCloud