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

Commit afe4155c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v4.9-rc4' of... 

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.
parents a909d3e6 fd9afd3c

drivers/usb/dwc3/core.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -769,15 +769,14 @@ static int dwc3_core_init(struct dwc3 *dwc) 
	return 0;

	return 0;





err4:

err4:

	phy_power_off(dwc->usb2_generic_phy);

	phy_power_off(dwc->usb3_generic_phy);





err3:

err3:

	phy_power_off(dwc->usb3_generic_phy);

	phy_power_off(dwc->usb2_generic_phy);





err2:

err2:

	usb_phy_set_suspend(dwc->usb2_phy, 1);

	usb_phy_set_suspend(dwc->usb2_phy, 1);

	usb_phy_set_suspend(dwc->usb3_phy, 1);

	usb_phy_set_suspend(dwc->usb3_phy, 1);

	dwc3_core_exit(dwc);





err1:

err1:

	usb_phy_shutdown(dwc->usb2_phy);

	usb_phy_shutdown(dwc->usb2_phy);

drivers/usb/dwc3/dwc3-st.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/regmap.h>

#include <linux/regmap.h>

#include <linux/reset.h>

#include <linux/reset.h>

#include <linux/pinctrl/consumer.h>

#include <linux/usb/of.h>

#include <linux/usb/of.h>





#include "core.h"

#include "core.h"

drivers/usb/gadget/function/u_ether.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -588,14 +588,6 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, 




	req->length = length;

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

	retval = usb_ep_queue(in, req, GFP_ATOMIC);

	switch (retval) {

	switch (retval) {

	default:

	default: