From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042907.422777620@goodmis.org> Date: Wed, 11 Sep 2013 00:28:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anders Hammarquist , Johan Hovold , Greg Kroah-Hartman Subject: [091/251] USB: ti_usb_3410_5052: fix dynamic-id matching References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0091-USB-ti_usb_3410_5052-fix-dynamic-id-matching.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold [ Upstream commit 1fad56424f5ad3ce4973505a357212b2e2282b3f ] 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 Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman Signed-off-by: Steven Rostedt --- drivers/usb/serial/ti_usb_3410_5052.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index c7550bf..d654036 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -383,7 +383,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"); -- 1.7.10.4