redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

USB-serial fixes for v4.15-rc2

Browse source 
Here are some new device ids.
 
 All have been in linux-next with no reported issues.
 
 Signed-off-by: Johan Hovold <johan@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEHszNKQClByu0A+9RQQ3kT97htJUFAlof66MRHGpvaGFuQGtl
 cm5lbC5vcmcACgkQQQ3kT97htJXHjA//WZNqq9HSLstnCh+jsQaY9AR9lEUza4gx
 3N92tc/aVqSbZb9YitIbr8RGyE+nQgbUj1bq3WqegPzdIiyrqFBXCCDoogAi8pks
 lzQ+/MxsbeH94G873EDUIQCrez6zXqCytnSh/8v01E72CD29H2Hp7fmFYYAW2xCT
 zIiWD9Vu3EeqfDeHd9aElVqOXjZ4d/GTul0VCyoR9TsUlPqk3zjVwc36mtrmLY9U
 z3yyGZzFm0HBbR6doblzX8pv4Yo7aXm71NC9FazGf8DmBDYmz2ypQXQIsPcA34Hu
 38jD3o3Ema/VICe62Gjspe4p+x5cgtzZYN41GF1nzRIaK3FaccKxbTYWK5UQYRM8
 tLR3S4QY+diEqfjZrcCIz8UHpXmrDAbUs7W+1eKWIJ8SB7ulwJs5vM3AvnaaKC5Q
 vbiaUI8umK56nbXgob3Wy7Rck/Q/lENYI2M+PFjtwRQ8ZGwlSyl+u9lwmUSP4a2M
 fpKG02hppDDRe0FS04g79zk7Gb+b87rbCU21CTVzlWxwEZkIhoSqbv74gN7cxGR2
 5yJdpaojL+Va/mxoJ4xeB8SPVg8UeUhPSrrcyGnbFBHnNYA6MuueL5gPj3hXB83F
 kRlnscQpHtm3Ew6gWmYSztkNYG71js6wJUsV4X10DRZHVAV1cJe6vUpTuucwtqWP
 94Czd2B4jZw=
 =xcVp
 -----END PGP SIGNATURE-----

Merge tag 'usb-serial-4.15-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial fixes for v4.15-rc2

Here are some new device ids.

All have been in linux-next with no reported issues.

Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Greg Kroah-Hartman 2017-11-30 16:33:04 +00:00
parent 7fee72d5e8 762ff4678e
commit 7a38b2d107
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/usb/serial/option.c
View file

@ -238,6 +238,7 @@ static void option_instat_callback(struct urb *urb);
/* These Quectel products use Quectel's vendor ID */
#define QUECTEL_PRODUCT_EC21 0x0121
#define QUECTEL_PRODUCT_EC25 0x0125
#define QUECTEL_PRODUCT_BG96 0x0296
#define CMOTECH_VENDOR_ID 0x16d8
#define CMOTECH_PRODUCT_6001 0x6001
@ -1182,6 +1183,8 @@ static const struct usb_device_id option_ids[] = {
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25),
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),

2
drivers/usb/serial/usb_debug.c
View file

@ -31,12 +31,14 @@ static const struct usb_device_id id_table[] = {
};
static const struct usb_device_id dbc_id_table[] = {
{ USB_DEVICE(0x1d6b, 0x0010) },
{ USB_DEVICE(0x1d6b, 0x0011) },
{ },
};
static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(0x0525, 0x127a) },
{ USB_DEVICE(0x1d6b, 0x0010) },
{ USB_DEVICE(0x1d6b, 0x0011) },
{ },
};