1 files changed, 15 insertions, 3 deletions

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 069c1cf0fdf7..9ab439d144ed 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -645,6 +645,7 @@ int usbnet_stop (struct net_device *net)
         struct driver_info      *info = dev->driver_info;
         int                     retval;
 
+        clear_bit(EVENT_DEV_OPEN, &dev->flags);
         netif_stop_queue (net);
 
         netif_info(dev, ifdown, dev->net,
@@ -736,6 +737,7 @@ int usbnet_open (struct net_device *net)
                 }
         }
 
+        set_bit(EVENT_DEV_OPEN, &dev->flags);
         netif_start_queue (net);
         netif_info(dev, ifup, dev->net,
                    "open: enable queueing (rx %d, tx %d) mtu %d %s framing\n",
@@ -1259,6 +1261,9 @@ void usbnet_disconnect (struct usb_interface *intf)
         if (dev->driver_info->unbind)
                 dev->driver_info->unbind (dev, intf);
 
+        usb_kill_urb(dev->interrupt);
+        usb_free_urb(dev->interrupt);
+
         free_netdev(net);
         usb_put_dev (xdev);
 }
@@ -1498,6 +1503,10 @@ int usbnet_resume (struct usb_interface *intf)
         int                     retval;
 
         if (!--dev->suspend_count) {
+                /* resume interrupt URBs */
+                if (dev->interrupt && test_bit(EVENT_DEV_OPEN, &dev->flags))
+                        usb_submit_urb(dev->interrupt, GFP_NOIO);
+
                 spin_lock_irq(&dev->txq.lock);
                 while ((res = usb_get_from_anchor(&dev->deferred))) {
 
@@ -1516,9 +1525,12 @@ int usbnet_resume (struct usb_interface *intf)
                 smp_mb();
                 clear_bit(EVENT_DEV_ASLEEP, &dev->flags);
                 spin_unlock_irq(&dev->txq.lock);
-                if (!(dev->txq.qlen >= TX_QLEN(dev)))
-                        netif_start_queue(dev->net);
-                tasklet_schedule (&dev->bh);
+
+                if (test_bit(EVENT_DEV_OPEN, &dev->flags)) {
+                        if (!(dev->txq.qlen >= TX_QLEN(dev)))
+                                netif_start_queue(dev->net);
+                        tasklet_schedule (&dev->bh);
+                }
         }
         return 0;
 }