Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1cee1d8 authored by Bruno Thomsen's avatar Bruno Thomsen Committed by Greg Kroah-Hartman
Browse files

USB: Microchip VID mislabeled as Hornby VID in ftdi_sio. 



Microchip VID (0x04d8) was mislabeled as Hornby VID according to USB-IDs.

A Full Speed USB Demo Board PID (0x000a) was mislabeled as
Hornby Elite (an Digital Command Controller Console for model railways).

Most likely the Hornby based their design on
PIC18F87J50 Full Speed USB Demo Board.

Signed-off-by: default avatarBruno Thomsen <bruno.thomsen@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88555a63

drivers/usb/serial/ftdi_sio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -801,7 +801,7 @@ static struct usb_device_id id_table_combined [] = { 
		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),

	{ USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(HORNBY_VID, HORNBY_ELITE_PID) },

	{ USB_DEVICE(MICROCHIP_VID, MICROCHIP_USB_BOARD_PID) },

	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },

	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },

	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),

	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

drivers/usb/serial/ftdi_sio_ids.h

+7 −3
Original line number Original line Diff line number Diff line
@@ -532,10 +532,14 @@ 
#define ADI_GNICEPLUS_PID	0xF001

#define ADI_GNICEPLUS_PID	0xF001





/*

/*

 * Hornby Elite

 * Microchip Technology, Inc.

 *

 * MICROCHIP_VID (0x04D8) and MICROCHIP_USB_BOARD_PID (0x000A) are also used by:

 * Hornby Elite - Digital Command Control Console

 * http://www.hornby.com/hornby-dcc/controllers/

 */

 */

#define HORNBY_VID		0x04D8

#define MICROCHIP_VID		0x04D8

#define HORNBY_ELITE_PID	0x000A

#define MICROCHIP_USB_BOARD_PID	0x000A /* CDC RS-232 Emulation Demo */





/*

/*

 * RATOC REX-USB60F

 * RATOC REX-USB60F