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

Commit 528a506e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a bunch of USB fixes for 3.18-rc3.

  Mostly usb-serial device ids and gadget fixes for issues that have
  been reported.  Full details are in the shortlog.

  All of these have been in linux-next for a while"

* tag 'usb-3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (42 commits)
  usb: chipidea: Fix oops when removing the ci_hdrc module
  usb: gadget: function: Fixed the return value on error path
  usb: dwc2: gadget: disable phy before turning off power regulators
  usb: gadget: function: Remove redundant usb_free_all_descriptors
  usb: dwc3: gadget: Properly initialize LINK TRB
  usb: dwc2: gadget: fix gadget unregistration in udc_stop() function
  usb: dwc2: Bits in bitfield should add up to 32
  usb: dwc2: gadget: sparse warning of context imbalance
  usb: gadget: udc: core: fix kernel oops with soft-connect
  usb: musb: musb_dsps: fix NULL pointer in suspend
  usb: musb: dsps: start OTG timer on resume again
  usb: gadget: loopback: don't queue requests to bogus endpoints
  usb: ffs: fix regression when quirk_ep_out_aligned_size flag is set
  usb: gadget: f_fs: remove redundant ffs_data_get()
  usb: gadget: udc: USB_GADGET_XILINX should depend on HAS_DMA
  Revert "usb: dwc3: dwc3-omap: Disable/Enable only wrapper interrupts in prepare/complete"
  usb: gadget: composite: enable BESL support
  usb: musb: cppi41: restart hrtimer only if not yet done
  usb: dwc3: ep0: fix Data Phase for transfer sizes aligned to wMaxPacketSize
  usb: serial: ftdi_sio: add "bricked" FTDI device PID
  ...
parents 4f4274af 9c19db5b

drivers/usb/chipidea/core.c

+0 −1
Original line number Diff line number Diff line
@@ -742,7 +742,6 @@ static int ci_hdrc_remove(struct platform_device *pdev) 
	ci_role_destroy(ci);

	ci_hdrc_enter_lpm(ci, true);

	usb_phy_shutdown(ci->transceiver);

	kfree(ci->hw_bank.regmap);



	return 0;

}

drivers/usb/dwc2/core.h

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ struct dwc2_hsotg { 
			unsigned port_suspend_change:1;

			unsigned port_over_current_change:1;

			unsigned port_l1_change:1;

			unsigned reserved:26;

			unsigned reserved:25;

		} b;

	} flags;

drivers/usb/dwc2/gadget.c

+7 −7
Original line number Diff line number Diff line
@@ -2561,8 +2561,10 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, 
			hs_ep->fifo_size = val;

			break;

		}

		if (i == 8)

			return -ENOMEM;

		if (i == 8) {

			ret = -ENOMEM;

			goto error;

		}

	}



	/* for non control endpoints, set PID to D0 */
@@ -2579,6 +2581,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, 
	/* enable the endpoint interrupt */

	s3c_hsotg_ctrl_epint(hsotg, index, dir_in, 1);



error:

	spin_unlock_irqrestore(&hsotg->lock, flags);

	return ret;

}
@@ -2934,9 +2937,7 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget, 


	spin_lock_irqsave(&hsotg->lock, flags);



	if (!driver)

	hsotg->driver = NULL;



	hsotg->gadget.speed = USB_SPEED_UNKNOWN;



	spin_unlock_irqrestore(&hsotg->lock, flags);
@@ -3567,6 +3568,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev) 
		s3c_hsotg_initep(hsotg, &hsotg->eps[epnum], epnum);



	/* disable power and clock */

	s3c_hsotg_phy_disable(hsotg);



	ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),

				    hsotg->supplies);
@@ -3575,8 +3577,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev) 
		goto err_ep_mem;

	}



	s3c_hsotg_phy_disable(hsotg);



	ret = usb_add_gadget_udc(&pdev->dev, &hsotg->gadget);

	if (ret)

		goto err_ep_mem;

drivers/usb/dwc3/dwc3-omap.c

+2 −13
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int dwc3_omap_prepare(struct device *dev) 
{

	struct dwc3_omap	*omap = dev_get_drvdata(dev);



	dwc3_omap_write_irqmisc_set(omap, 0x00);

	dwc3_omap_disable_irqs(omap);



	return 0;

}
@@ -605,19 +605,8 @@ static int dwc3_omap_prepare(struct device *dev) 
static void dwc3_omap_complete(struct device *dev)

{

	struct dwc3_omap	*omap = dev_get_drvdata(dev);

	u32			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_set(omap, reg);

	dwc3_omap_enable_irqs(omap);

}



static int dwc3_omap_suspend(struct device *dev)

drivers/usb/dwc3/dwc3-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3	0xabcd

#define PCI_DEVICE_ID_INTEL_BYT		0x0f37

#define PCI_DEVICE_ID_INTEL_MRFLD	0x119e

#define PCI_DEVICE_ID_INTEL_BSW		0x22B7



struct dwc3_pci {

	struct device		*dev;
@@ -181,6 +182,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
		PCI_DEVICE(PCI_VENDOR_ID_SYNOPSYS,

				PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3),

	},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BSW), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MRFLD), },

	{  }	/* Terminating Entry */