mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 14:04:54 +02:00
USB: serial: mos7840: remove duplicated 0xac24 device ID
commit211f323768upstream. 0xac24 device ID is already defined and used via BANDB_DEVICE_ID_USO9ML2_4. Remove the duplicate from the list. Fixes:27f1281d5f("USB: serial: Extra device/vendor ID for mos7840 driver") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d58fc9e9c1
commit
dc131d3f13
|
|
@ -107,7 +107,6 @@
|
||||||
#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02
|
#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02
|
||||||
#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
|
#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
|
||||||
#define BANDB_DEVICE_ID_USOPTL4_4P 0xBC03
|
#define BANDB_DEVICE_ID_USOPTL4_4P 0xBC03
|
||||||
#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24
|
|
||||||
|
|
||||||
/* Interrupt Routine Defines */
|
/* Interrupt Routine Defines */
|
||||||
|
|
||||||
|
|
@ -186,7 +185,6 @@ static const struct usb_device_id id_table[] = {
|
||||||
{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P) },
|
{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P) },
|
||||||
{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4) },
|
{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4) },
|
||||||
{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P) },
|
{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P) },
|
||||||
{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4) },
|
|
||||||
{} /* terminating entry */
|
{} /* terminating entry */
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(usb, id_table);
|
MODULE_DEVICE_TABLE(usb, id_table);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user