OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQI6BAABCAAkBQJYGKWZHRxmZWxpcGUuYmFsYmlAbGludXguaW50ZWwuY29tAAoJ
 EMy+uJnhGpkGcvsQAIooMZDEuH7rZKjqblKbreZOMFw07PIyQFN70yygvs3Q9Jqf
 gdkq3Ao89Q5dhbPPMv7CeblZgXpqax2NfexoJr/vqcgfscM63DAg8p6VZOX6booF
 Jp7zR1VLRoVm6k4/3V71t5j2NBOOxp4OrE9GeAGQyv70e1j8v0C/9dQVqjb9ljaI
 3l8A1HbIR/OBnUN7ukbhZ1CWTF5AmtqAU62EENXltp9F+Zis98FiHqCPiG0oMnMW
 LVz/hxh4Jv4KFxlNOmyFy0twhUfUbXrvU/Q/kVWYlpBIi8II4ihO3vazaJ7H7jgX
 G0KlKORDMbO3+UWlAn8RmMxuaAYDLBIdx4hCOwI18h02ADa+/MspVeII88Kg03e5
 AQyDUAQPJImw8zk4UaLqxqBr3G/Rcj0/ubaBhRuR9eGJb/lsWhB6A1X9VWCcxZL1
 PuWAUTj3EMhssPc7TlTG3s/WOuLoBgZNIyJAD6zZTwhg2ns88iWDd/tw/v91nLo6
 j0l67/eCd4HI+COcfDMi+r/CMG612VAKTSFkaiwp2CfADWB9b3zDc8/vvVhJ6Ga5
 k8LkVeAdav81gAELO6vyWLgj9xFoC+ZmoNW19sUCjW9UTXgXXI703bkiz7N6Jyoy
 JDUBiv/ntd6yj0Bdn4NphhX2Uf2ecVQwusMwF/y1iETR+88JWNOqZSUsNqwk
 =76zx
 -----END PGP SIGNATURE-----

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.
This commit is contained in:
Greg Kroah-Hartman 2016-11-01 09:00:56 -06:00
parent a909d3e636 fd9afd3cbe
commit afe4155ce9
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/dwc3/core.c
View File

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

1
drivers/usb/dwc3/dwc3-st.c
View File

@ -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"

8
drivers/usb/gadget/function/u_ether.c
View File

@ -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: