diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-01 09:00:56 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-01 09:00:56 -0600 |
| commit | afe4155ce940d0c2a8fa3da5a29ea46f98052a73 (patch) | |
| tree | 66edd6ec0a38a7ae94b2d2a3c58a62ee9a9650da | |
| parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
| parent | fd9afd3cbe404998d732be6cc798f749597c5114 (diff) | |
| download | linux-afe4155ce940d0c2a8fa3da5a29ea46f98052a73.tar.gz linux-afe4155ce940d0c2a8fa3da5a29ea46f98052a73.tar.bz2 linux-afe4155ce940d0c2a8fa3da5a29ea46f98052a73.zip | |
Merge tag 'fixes-for-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
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.
| -rw-r--r-- | drivers/usb/dwc3/core.c | 5 | ||||
| -rw-r--r-- | drivers/usb/dwc3/dwc3-st.c | 1 | ||||
| -rw-r--r-- | drivers/usb/gadget/function/u_ether.c | 8 |
3 files changed, 3 insertions, 11 deletions
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 7287a763cd0c..fea446900cad 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -769,15 +769,14 @@ static int dwc3_core_init(struct dwc3 *dwc) return 0; err4: - phy_power_off(dwc->usb2_generic_phy); + phy_power_off(dwc->usb3_generic_phy); err3: - phy_power_off(dwc->usb3_generic_phy); + phy_power_off(dwc->usb2_generic_phy); err2: usb_phy_set_suspend(dwc->usb2_phy, 1); usb_phy_set_suspend(dwc->usb3_phy, 1); - dwc3_core_exit(dwc); err1: usb_phy_shutdown(dwc->usb2_phy); diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c index 89a2f712fdfe..aaaf256f71dd 100644 --- a/drivers/usb/dwc3/dwc3-st.c +++ b/drivers/usb/dwc3/dwc3-st.c @@ -31,6 +31,7 @@ #include <linux/slab.h> #include <linux/regmap.h> #include <linux/reset.h> +#include <linux/pinctrl/consumer.h> #include <linux/usb/of.h> #include "core.h" diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index fe1811650dbc..5d1bd13a56c1 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -588,14 +588,6 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, req->length = length; - /* throttle high/super speed IRQ rate back slightly */ - if (gadget_is_dualspeed(dev->gadget)) - req->no_interrupt = (((dev->gadget->speed == USB_SPEED_HIGH || - dev->gadget->speed == USB_SPEED_SUPER)) && - !list_empty(&dev->tx_reqs)) - ? ((atomic_read(&dev->tx_qlen) % dev->qmult) != 0) - : 0; - retval = usb_ep_queue(in, req, GFP_ATOMIC); switch (retval) { default: |