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

Commit 7a38b2d1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-4.15-rc2' of... 

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: default avatarJohan Hovold <johan@kernel.org>
parents 7fee72d5 762ff467

drivers/usb/serial/option.c

+3 −0
Original line number Diff line number Diff line
@@ -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),

drivers/usb/serial/usb_debug.c

+2 −0
Original line number Diff line number Diff line
@@ -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) },

	{ },

};