diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 07:43:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 07:43:16 -0700 |
| commit | 78283dd29e647775cb1e63a4d6554b3090b9a9ff (patch) | |
| tree | 46a179781ed356c0546379ecc46ca5daed7ae50a /drivers/usb/serial/ti_usb_3410_5052.c | |
| parent | 435932f2c75efcdd07273a437b9be32647d56d73 (diff) | |
| parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
| download | linux-78283dd29e647775cb1e63a4d6554b3090b9a9ff.tar.gz | |
Merge 3.11-rc3 into usb-next
Diffstat (limited to 'drivers/usb/serial/ti_usb_3410_5052.c')
| -rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 2 |
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 5585b20397fb3..5c07d55ece7ad 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -309,7 +309,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"); |