Commit 264a58e6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-6.18-rc1' of... 

Merge tag 'usb-serial-6.18-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next

Johan writes:

USB serial updates for 6.18-rc1

Here are the USB serial updates for 6.18-rc1 consisting of some new
modem device ids and a trivial cleanup.

Everything has been in linux-next with no reported issues.

* tag 'usb-serial-6.18-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add SIMCom 8230C compositions
  USB: serial: oti6858: remove extranenous ; after comment
parents ef351f8e 0e0ba0ec

drivers/usb/serial/option.c

+6 −0
Original line number Diff line number Diff line
@@ -2114,6 +2114,12 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) },	/* Simcom SIM7500/SIM7600 MBIM mode */

	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff),	/* Simcom SIM7500/SIM7600 RNDIS mode */

	  .driver_info = RSVD(7) },

	{ USB_DEVICE(0x1e0e, 0x9071),				/* Simcom SIM8230 RMNET mode */

	  .driver_info = RSVD(3) | RSVD(4) },

	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9078, 0xff),	/* Simcom SIM8230 ECM mode */

	  .driver_info = RSVD(5) },

	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x907b, 0xff),	/* Simcom SIM8230 RNDIS mode */

	  .driver_info = RSVD(5) },

	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) },	/* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */

	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) },	/* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */

	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),

drivers/usb/serial/oti6858.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ struct oti6858_control_pkt { 
#define PIN_DTR			0x04	/* output pin */

#define PIN_RI			0x02	/* input pin, active low */

#define PIN_DCD			0x01	/* input pin, active low */

	u8	rx_bytes_avail;		/* number of bytes in rx buffer */;

	u8	rx_bytes_avail;		/* number of bytes in rx buffer */

};



#define OTI6858_CTRL_PKT_SIZE	sizeof(struct oti6858_control_pkt)