Commit 3e09b7e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are some USB driver ids for 4.5-rc7, and the removal of a driver
  we merged in 4.5-rc1 but it turns out it's not needed as the hardware
  is the same as a driver we already have in the tree.

  This was only figured out after doing a lot of cleanup on it, gotta
  love vendor-provided drivers...  The new device ids for the devices
  for this driver will be added later on when testing is completed, but
  for now, we will remove the driver to keep people from accidentally
  cleaning it up.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: qcserial: add Sierra Wireless EM74xx device ID
  Revert "USB: serial: add Moxa UPORT 11x0 driver"
  USB: serial: option: add support for Quectel UC20
  USB: serial: option: add support for Telit LE922 PID 0x1045
  USB: cp210x: Add ID for Parrot NMEA GPS Flight Recorder
  USB: qcserial: add Dell Wireless 5809e Gobi 4G HSPA+ (rev3)
  usb: chipidea: otg: change workqueue ci_otg as freezable
parents 67944024 861c3849

drivers/usb/chipidea/otg.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static void ci_otg_work(struct work_struct *work) 
int ci_hdrc_otg_init(struct ci_hdrc *ci)

{

	INIT_WORK(&ci->work, ci_otg_work);

	ci->wq = create_singlethread_workqueue("ci_otg");

	ci->wq = create_freezable_workqueue("ci_otg");

	if (!ci->wq) {

		dev_err(ci->dev, "can't create workqueue\n");

		return -ENODEV;

drivers/usb/serial/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -475,22 +475,6 @@ config USB_SERIAL_MOS7840 
	  To compile this driver as a module, choose M here: the

	  module will be called mos7840.  If unsure, choose N.



config USB_SERIAL_MXUPORT11

	tristate "USB Moxa UPORT 11x0 Serial Driver"

	---help---

	  Say Y here if you want to use a MOXA UPort 11x0 Serial hub.



	  This driver supports:



	  - UPort 1110  : 1 port RS-232 USB to Serial Hub.

	  - UPort 1130  : 1 port RS-422/485 USB to Serial Hub.

	  - UPort 1130I : 1 port RS-422/485 USB to Serial Hub with Isolation.

	  - UPort 1150  : 1 port RS-232/422/485 USB to Serial Hub.

	  - UPort 1150I : 1 port RS-232/422/485 USB to Serial Hub with Isolation.



	  To compile this driver as a module, choose M here: the

	  module will be called mxu11x0.



config USB_SERIAL_MXUPORT

	tristate "USB Moxa UPORT Serial Driver"

	---help---

drivers/usb/serial/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ obj-$(CONFIG_USB_SERIAL_METRO) += metro-usb.o 
obj-$(CONFIG_USB_SERIAL_MOS7720)		+= mos7720.o

obj-$(CONFIG_USB_SERIAL_MOS7840)		+= mos7840.o

obj-$(CONFIG_USB_SERIAL_MXUPORT)		+= mxuport.o

obj-$(CONFIG_USB_SERIAL_MXUPORT11)		+= mxu11x0.o

obj-$(CONFIG_USB_SERIAL_NAVMAN)			+= navman.o

obj-$(CONFIG_USB_SERIAL_OMNINET)		+= omninet.o

obj-$(CONFIG_USB_SERIAL_OPTICON)		+= opticon.o

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */

	{ USB_DEVICE(0x1901, 0x0190) }, /* GE B850 CP2105 Recorder interface */

	{ USB_DEVICE(0x1901, 0x0193) }, /* GE B650 CP2104 PMC interface */

	{ USB_DEVICE(0x19CF, 0x3000) }, /* Parrot NMEA GPS Flight Recorder */

	{ USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */

	{ USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */

	{ USB_DEVICE(0x1BA4, 0x0002) },	/* Silicon Labs 358x factory default */

drivers/usb/serial/mxu11x0.c

deleted100644 → 0
+0 −1006

File deleted.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE