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

Commit 1163d504 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here's a round of USB fixes for 4.0-rc3.

  Nothing major, the usual gadget, xhci and usb-serial fixes and a few
  new device ids as well.

  All have been in linux-next successfully"

* tag 'usb-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (36 commits)
  xhci: Workaround for PME stuck issues in Intel xhci
  xhci: fix reporting of 0-sized URBs in control endpoint
  usb: ftdi_sio: Add jtag quirk support for Cyber Cortex AV boards
  USB: ch341: set tty baud speed according to tty struct
  USB: serial: cp210x: Adding Seletek device id's
  USB: pl2303: disable break on shutdown
  USB: mxuport: fix null deref when used as a console
  USB: serial: clean up bus probe error handling
  USB: serial: fix port attribute-creation race
  USB: serial: fix tty-device error handling at probe
  USB: serial: fix potential use-after-free after failed probe
  USB: console: add dummy __module_get
  USB: ftdi_sio: add PIDs for Actisense USB devices
  Revert "USB: serial: make bulk_out_size a lower limit"
  cdc-acm: Add support for Denso cradle CU-321
  usb-storage: support for more than 8 LUNs
  uas: Add US_FL_NO_REPORT_OPCODES for JMicron JMS539
  USB: usbfs: don't leak kernel data in siginfo
  xhci: Clear the host side toggle manually when endpoint is 'soft reset'
  xhci: Allocate correct amount of scratchpad buffers
  ...
parents bbbce516 b8cb91e0

drivers/usb/class/cdc-acm.c

+2 −0
Original line number Diff line number Diff line
@@ -1650,6 +1650,8 @@ static int acm_reset_resume(struct usb_interface *intf) 


static const struct usb_device_id acm_ids[] = {

	/* quirky and broken devices */

	{ USB_DEVICE(0x076d, 0x0006), /* Denso Cradle CU-321 */

	.driver_info = NO_UNION_NORMAL, },/* has no union descriptor */

	{ USB_DEVICE(0x17ef, 0x7000), /* Lenovo USB modem */

	.driver_info = NO_UNION_NORMAL, },/* has no union descriptor */

	{ USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */

drivers/usb/core/devio.c

+2 −0
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ static void async_completed(struct urb *urb) 
	as->status = urb->status;

	signr = as->signr;

	if (signr) {

		memset(&sinfo, 0, sizeof(sinfo));

		sinfo.si_signo = as->signr;

		sinfo.si_errno = as->status;

		sinfo.si_code = SI_ASYNCIO;
@@ -2382,6 +2383,7 @@ static void usbdev_remove(struct usb_device *udev) 
		wake_up_all(&ps->wait);

		list_del_init(&ps->list);

		if (ps->discsignr) {

			memset(&sinfo, 0, sizeof(sinfo));

			sinfo.si_signo = ps->discsignr;

			sinfo.si_errno = EPIPE;

			sinfo.si_code = SI_ASYNCIO;

drivers/usb/dwc3/dwc3-omap.c

+28 −2
Original line number Diff line number Diff line
@@ -205,6 +205,18 @@ static void dwc3_omap_write_irq0_set(struct dwc3_omap *omap, u32 value) 
						omap->irq0_offset, value);

}



static void dwc3_omap_write_irqmisc_clr(struct dwc3_omap *omap, u32 value)

{

	dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_CLR_MISC +

						omap->irqmisc_offset, value);

}



static void dwc3_omap_write_irq0_clr(struct dwc3_omap *omap, u32 value)

{

	dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_CLR_0 -

						omap->irq0_offset, value);

}



static void dwc3_omap_set_mailbox(struct dwc3_omap *omap,

	enum omap_dwc3_vbus_id_status status)

{
@@ -345,9 +357,23 @@ static void dwc3_omap_enable_irqs(struct dwc3_omap *omap) 


static void dwc3_omap_disable_irqs(struct dwc3_omap *omap)

{

	u32			reg;



	/* disable all IRQs */

	dwc3_omap_write_irqmisc_set(omap, 0x00);

	dwc3_omap_write_irq0_set(omap, 0x00);

	reg = USBOTGSS_IRQO_COREIRQ_ST;

	dwc3_omap_write_irq0_clr(omap, reg);



	reg = (USBOTGSS_IRQMISC_OEVT |

			USBOTGSS_IRQMISC_DRVVBUS_RISE |

			USBOTGSS_IRQMISC_CHRGVBUS_RISE |

			USBOTGSS_IRQMISC_DISCHRGVBUS_RISE |

			USBOTGSS_IRQMISC_IDPULLUP_RISE |

			USBOTGSS_IRQMISC_DRVVBUS_FALL |

			USBOTGSS_IRQMISC_CHRGVBUS_FALL |

			USBOTGSS_IRQMISC_DISCHRGVBUS_FALL |

			USBOTGSS_IRQMISC_IDPULLUP_FALL);



	dwc3_omap_write_irqmisc_clr(omap, reg);

}



static u64 dwc3_omap_dma_mask = DMA_BIT_MASK(32);

drivers/usb/gadget/configfs.c

+0 −2
Original line number Diff line number Diff line
@@ -1161,7 +1161,6 @@ static ssize_t interf_grp_compatible_id_store(struct usb_os_desc *desc, 
	if (desc->opts_mutex)

		mutex_lock(desc->opts_mutex);

	memcpy(desc->ext_compat_id, page, l);

	desc->ext_compat_id[l] = '\0';



	if (desc->opts_mutex)

		mutex_unlock(desc->opts_mutex);
@@ -1192,7 +1191,6 @@ static ssize_t interf_grp_sub_compatible_id_store(struct usb_os_desc *desc, 
	if (desc->opts_mutex)

		mutex_lock(desc->opts_mutex);

	memcpy(desc->ext_compat_id + 8, page, l);

	desc->ext_compat_id[l + 8] = '\0';



	if (desc->opts_mutex)

		mutex_unlock(desc->opts_mutex);

drivers/usb/gadget/function/f_hid.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) 
	return status;

}



const struct file_operations f_hidg_fops = {

static const struct file_operations f_hidg_fops = {

	.owner		= THIS_MODULE,

	.open		= f_hidg_open,

	.release	= f_hidg_release,