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

Commit 034a0f6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB bugfixes from Greg KH:
 "Here's a round of USB bugfixes, quirk additions, and new device ids
  for 3.16-rc4.  Nothing major in here at all, just a bunch of tiny
  changes.  All have been in linux-next with no reported issues"

* tag 'usb-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (33 commits)
  usb: chipidea: udc: delete td from req's td list at ep_dequeue
  usb: Kconfig: make EHCI_MSM selectable for QCOM SOCs
  usb-storage/SCSI: Add broken_fua blacklist flag
  usb: musb: dsps: fix the base address for accessing the mode register
  tools: ffs-test: fix header values endianess
  usb: phy: msm: Do not do runtime pm if the phy is not idle
  usb: musb: Ensure that cppi41 timer gets armed on premature DMA TX irq
  usb: gadget: gr_udc: Fix check for invalid number of microframes
  usb: musb: Fix panic upon musb_am335x module removal
  usb: gadget: f_fs: resurect usb_functionfs_descs_head structure
  Revert "tools: ffs-test: convert to new descriptor format fixing compilation error"
  xhci: Fix runtime suspended xhci from blocking system suspend.
  xhci: clear root port wake on bits if controller isn't wake-up capable
  xhci: correct burst count field for isoc transfers on 1.0 xhci hosts
  xhci: Use correct SLOT ID when handling a reset device command
  MAINTAINERS: update e-mail address
  usb: option: add/modify Olivetti Olicard modems
  USB: ftdi_sio: fix null deref at port probe
  MAINTAINERS: drop two usb-serial subdriver entries
  USB: option: add device ID for SpeedUp SU9800 usb 3g modem
  ...
parents 9911f2e1 e4adcff0

MAINTAINERS

+1 −13
Original line number Diff line number Diff line
@@ -9406,12 +9406,6 @@ S: Maintained 
F:	drivers/usb/host/isp116x*

F:	include/linux/usb/isp116x.h



USB KAWASAKI LSI DRIVER

M:	Oliver Neukum <oliver@neukum.org>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/kl5kusb105.*



USB MASS STORAGE DRIVER

M:	Matthew Dharm <mdharm-usb@one-eyed-alien.net>

L:	linux-usb@vger.kernel.org
@@ -9439,12 +9433,6 @@ S: Maintained 
F:	Documentation/usb/ohci.txt

F:	drivers/usb/host/ohci*



USB OPTION-CARD DRIVER

M:	Matthias Urlichs <smurf@smurf.noris.de>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/option.c



USB PEGASUS DRIVER

M:	Petko Manolov <petkan@nucleusys.com>

L:	linux-usb@vger.kernel.org
@@ -9477,7 +9465,7 @@ S: Maintained 
F:	drivers/net/usb/rtl8150.c



USB SERIAL SUBSYSTEM

M:	Johan Hovold <jhovold@gmail.com>

M:	Johan Hovold <johan@kernel.org>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	Documentation/usb/usb-serial.txt

drivers/scsi/sd.c

+4 −1
Original line number Diff line number Diff line
@@ -2441,7 +2441,10 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer) 
		}



		sdkp->DPOFUA = (data.device_specific & 0x10) != 0;

		if (sdkp->DPOFUA && !sdkp->device->use_10_for_rw) {

		if (sdp->broken_fua) {

			sd_first_printk(KERN_NOTICE, sdkp, "Disabling FUA\n");

			sdkp->DPOFUA = 0;

		} else if (sdkp->DPOFUA && !sdkp->device->use_10_for_rw) {

			sd_first_printk(KERN_NOTICE, sdkp,

				  "Uses READ/WRITE(6), disabling FUA\n");

			sdkp->DPOFUA = 0;

drivers/usb/chipidea/udc.c

+7 −0
Original line number Diff line number Diff line
@@ -1321,6 +1321,7 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req) 
	struct ci_hw_ep  *hwep  = container_of(ep,  struct ci_hw_ep, ep);

	struct ci_hw_req *hwreq = container_of(req, struct ci_hw_req, req);

	unsigned long flags;

	struct td_node *node, *tmpnode;



	if (ep == NULL || req == NULL || hwreq->req.status != -EALREADY ||

		hwep->ep.desc == NULL || list_empty(&hwreq->queue) ||
@@ -1331,6 +1332,12 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req) 


	hw_ep_flush(hwep->ci, hwep->num, hwep->dir);



	list_for_each_entry_safe(node, tmpnode, &hwreq->tds, td) {

		dma_pool_free(hwep->td_pool, node->ptr, node->dma);

		list_del(&node->td);

		kfree(node);

	}



	/* pop request */

	list_del_init(&hwreq->queue);

drivers/usb/dwc3/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ comment "Platform Glue Driver Support" 
config USB_DWC3_OMAP

	tristate "Texas Instruments OMAP5 and similar Platforms"

	depends on EXTCON && (ARCH_OMAP2PLUS || COMPILE_TEST)

	depends on OF

	default USB_DWC3

	help

	  Some platforms from Texas Instruments like OMAP5, DRA7xxx and

drivers/usb/dwc3/dwc3-omap.c

+14 −3
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int dwc3_omap_remove_core(struct device *dev, void *c) 
{

	struct platform_device *pdev = to_platform_device(dev);



	platform_device_unregister(pdev);

	of_device_unregister(pdev);



	return 0;

}
@@ -599,7 +599,7 @@ static int dwc3_omap_prepare(struct device *dev) 
{

	struct dwc3_omap	*omap = dev_get_drvdata(dev);



	dwc3_omap_disable_irqs(omap);

	dwc3_omap_write_irqmisc_set(omap, 0x00);



	return 0;

}
@@ -607,8 +607,19 @@ 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;



	dwc3_omap_enable_irqs(omap);

	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);

}



static int dwc3_omap_suspend(struct device *dev)