projects
/
wrapfs-5.3.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6034ffb
)
USB: cp210x: add ID for ELV Marble Sound Board 1
author
Oliver Freyermuth
<o.freyermuth@googlemail.com>
Mon, 28 Dec 2015 17:37:38 +0000
(18:37 +0100)
committer
Sasha Levin
<sasha.levin@oracle.com>
Tue, 8 Mar 2016 02:28:51 +0000
(21:28 -0500)
[ Upstream commit
f7d7f59ab124748156ea551edf789994f05da342
]
Add the USB device ID for ELV Marble Sound Board 1.
Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/usb/serial/cp210x.c
patch
|
blob
|
history
diff --git
a/drivers/usb/serial/cp210x.c
b/drivers/usb/serial/cp210x.c
index 9364bed2a8b351010ed273150a0b9f64e01ee15f..1dd9919081f80661d4cb3eb47d3a597c595beb6f 100644
(file)
--- a/
drivers/usb/serial/cp210x.c
+++ b/
drivers/usb/serial/cp210x.c
@@
-161,6
+161,7
@@
static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */
{ USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
{ USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
+ { USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */
{ USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */
{ USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */
{ USB_DEVICE(0x1BA4, 0x0002) }, /* Silicon Labs 358x factory default */