Skip to content

Commit 0f266ab

Browse files
committed
USB: ftdi_sio: add device ids for ScienceScope
This adds the requested device ids to the ftdi_sio driver. Reported-by: Ewan Bingham <[email protected]> Cc: Kuba Ober <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 843bb1d commit 0f266ab

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

drivers/usb/serial/ftdi_sio.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,9 @@ static struct usb_device_id id_table_combined [] = {
791791
{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) },
792792
{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) },
793793
{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) },
794+
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
795+
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
796+
{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
794797
{ }, /* Optional parameter entry */
795798
{ } /* Terminating entry */
796799
};

drivers/usb/serial/ftdi_sio_ids.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,3 +1095,8 @@
10951095
* Accesio USB Data Acquisition products (http://www.accesio.com/)
10961096
*/
10971097
#define ACCESIO_COM4SM_PID 0xD578
1098+
1099+
/* www.sciencescope.co.uk educational dataloggers */
1100+
#define FTDI_SCIENCESCOPE_LOGBOOKML_PID 0xFF18
1101+
#define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID 0xFF1C
1102+
#define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID 0xFF1D

0 commit comments

Comments
 (0)