diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-11-27 14:40:51 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-11-27 14:40:51 +0300 |
commit | acf403ecc4155153e5e2c1640be90fc166e56ba7 (patch) | |
tree | e9655b84776cec00a4da077f5dd1e336dfd9c7c0 /drivers/usb/serial/cp210x.c | |
parent | 69eba10e606a80665f8573221fec589430d9d1cb (diff) | |
parent | b61f90eac1ff9d1b30497e611aba4651d4066706 (diff) | |
download | linux-acf403ecc4155153e5e2c1640be90fc166e56ba7.tar.xz |
Merge branch 'topic/usb-resume' into for-next
Merge the proper mixer resume support for quirk codes.
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
-rw-r--r-- | drivers/usb/serial/cp210x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index eca1747ca8c7..cfd009dc4018 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -155,6 +155,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ + { USB_DEVICE(0x1BA4, 0x0002) }, /* Silicon Labs 358x factory default */ { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ { USB_DEVICE(0x1D6F, 0x0010) }, /* Seluxit ApS RF Dongle */ { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */ |