Merge tag 'fixes-for-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Felipe writes:

usb: fixes for v4.9-rc4

Three more fixes for current -rc cycle. One
randbuild fix on dwc3-st which was lacking
<linux/pinctrl/consumer.h>, removal of IRQ
throttling for networking gadgets and a fix for
dwc3's error handling on failed initialization.

Greg Kroah-Hartman 9 years ago afe4155c a909d3e6

+3 -11

3 changed files

expand all

drivers

usb

dwc3

core.c

dwc3-st.c

gadget

function

u_ether.c

+2 -3

drivers/usb/dwc3/core.c

··· 769 769 return 0; 770 770 771 771 err4: 772 - phy_power_off(dwc->usb2_generic_phy); 772 + phy_power_off(dwc->usb3_generic_phy); 773 773 774 774 err3: 775 - phy_power_off(dwc->usb3_generic_phy); 775 + phy_power_off(dwc->usb2_generic_phy); 776 776 777 777 err2: 778 778 usb_phy_set_suspend(dwc->usb2_phy, 1); 779 779 usb_phy_set_suspend(dwc->usb3_phy, 1); 780 - dwc3_core_exit(dwc); 781 780 782 781 err1: 783 782 usb_phy_shutdown(dwc->usb2_phy);

drivers/usb/dwc3/dwc3-st.c

··· 31 31 #include <linux/slab.h> 32 32 #include <linux/regmap.h> 33 33 #include <linux/reset.h> 34 + #include <linux/pinctrl/consumer.h> 34 35 #include <linux/usb/of.h> 35 36 36 37 #include "core.h"

-8

drivers/usb/gadget/function/u_ether.c

··· 588 588 589 589 req->length = length; 590 590 591 - /* throttle high/super speed IRQ rate back slightly */ 592 - if (gadget_is_dualspeed(dev->gadget)) 593 - req->no_interrupt = (((dev->gadget->speed == USB_SPEED_HIGH || 594 - dev->gadget->speed == USB_SPEED_SUPER)) && 595 - !list_empty(&dev->tx_reqs)) 596 - ? ((atomic_read(&dev->tx_qlen) % dev->qmult) != 0) 597 - : 0; 598 - 599 591 retval = usb_ep_queue(in, req, GFP_ATOMIC); 600 592 switch (retval) { 601 593 default: