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

Commit 0f266abd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: ftdi_sio: add device ids for ScienceScope 



This adds the requested device ids to the ftdi_sio driver.

Reported-by: default avatarEwan Bingham <ewan@auc.co.uk>
Cc: Kuba Ober <kuba@mareimbrium.org>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 843bb1d0

drivers/usb/serial/ftdi_sio.c

+3 −0
Original line number Diff line number Diff line
@@ -791,6 +791,9 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },

	{ },					/* Optional parameter entry */

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio_ids.h

+5 −0
Original line number Diff line number Diff line
@@ -1095,3 +1095,8 @@ 
 * Accesio USB Data Acquisition products (http://www.accesio.com/)

 */

#define ACCESIO_COM4SM_PID 	0xD578



/* www.sciencescope.co.uk educational dataloggers */

#define FTDI_SCIENCESCOPE_LOGBOOKML_PID		0xFF18

#define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID	0xFF1C

#define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID	0xFF1D