1 files changed, 7 insertions, 13 deletions

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 504282af27e5..72514c46b478 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB Network driver infrastructure
  * Copyright (C) 2000-2005 by David Brownell
  * Copyright (C) 2003-2005 David Hollis <dhollis@davehollis.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -506,6 +494,7 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
 
         if (netif_running (dev->net) &&
             netif_device_present (dev->net) &&
+            test_bit(EVENT_DEV_OPEN, &dev->flags) &&
             !test_bit (EVENT_RX_HALT, &dev->flags) &&
             !test_bit (EVENT_DEV_ASLEEP, &dev->flags)) {
                 switch (retval = usb_submit_urb (urb, GFP_ATOMIC)) {
@@ -1431,6 +1420,11 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
                 spin_unlock_irqrestore(&dev->txq.lock, flags);
                 goto drop;
         }
+        if (netif_queue_stopped(net)) {
+                usb_autopm_put_interface_async(dev->intf);
+                spin_unlock_irqrestore(&dev->txq.lock, flags);
+                goto drop;
+        }
 
 #ifdef CONFIG_PM
         /* if this triggers the device is still a sleep */