Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / function / u_ether.c

diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index 74e9f5b5a45dd64d3cd4c3934d06a1637f1af6ef..e4920e5e1d647ff92c5118545309f1eb99396c36 100644 (file)
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -743,7 +743,8 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
 
        /* throttle highspeed IRQ rate back slightly */
        if (gadget_is_dualspeed(dev->gadget) &&
-                        (dev->gadget->speed == USB_SPEED_HIGH)) {
+                        (dev->gadget->speed == USB_SPEED_HIGH) &&
+                        !list_empty(&dev->tx_reqs)) {
                dev->tx_qlen++;
                if (dev->tx_qlen == (dev->qmult/2)) {
                        req->no_interrupt = 0;