projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 00e5a55c BS |
1 | From foo@baz Fri Jun 26 08:05:20 PDT 2009 |
| 2 | Date: Fri, 26 Jun 2009 08:05:20 -0700 | |
| 3 | To: Greg KH <greg@kroah.com> | |
| 4 | From: Greg Kroah-Hartman <gregkh@suse.de> | |
| 5 | Subject: USB: ti_usb_3410_5052: fix duplicate device ids. | |
| 6 | References: bnc#395775 | |
| 7 | Patch-mainline: 2.6.31 | |
| 8 | ||
| 9 | commit 1a1fab513734b3a4fca1bee8229e5ff7e1cb873c accidentally added the | |
| 10 | device id to both tables in the driver, which causes problems as this is | |
| 11 | only a single port device, not a multiple port device. | |
| 12 | ||
| 13 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 14 | --- | |
| 15 | drivers/usb/serial/ti_usb_3410_5052.c | 1 - | |
| 16 | 1 file changed, 1 deletion(-) | |
| 17 | ||
| 18 | --- a/drivers/usb/serial/ti_usb_3410_5052.c | |
| 19 | +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |
| 20 | @@ -240,7 +240,6 @@ static struct usb_device_id ti_id_table_ | |
| 21 | { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, | |
| 22 | { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, | |
| 23 | { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) }, | |
| 24 | - { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, | |
| 25 | }; | |
| 26 | ||
| 27 | static struct usb_device_id ti_id_table_combined[14+2*TI_EXTRA_VID_PID_COUNT+1] = { |