diff options
| author | Paul Stewart <pstew@chromium.org> | 2011-04-28 05:43:37 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-28 12:56:09 -0700 |
| commit | 68972efa657040f891c7eda07c7da8c8dd576788 (patch) | |
| tree | 56e451d2101c37802fa043e41f55b8b5daad6b82 /drivers | |
| parent | 7833aa05b8db63484b43b4b4c389cd4533140afb (diff) | |
| download | linux-3.10-68972efa657040f891c7eda07c7da8c8dd576788.tar.gz linux-3.10-68972efa657040f891c7eda07c7da8c8dd576788.tar.bz2 linux-3.10-68972efa657040f891c7eda07c7da8c8dd576788.zip | |
usbnet: Resubmit interrupt URB if device is open
Resubmit interrupt URB if device is open. Use a flag set in
usbnet_open() to determine this state. Also kill and free
interrupt URB in usbnet_disconnect().
[Rebased off git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git]
Signed-off-by: Paul Stewart <pstew@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 069c1cf0fdf..009bba3d753 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -736,6 +736,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 +1260,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 +1502,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))) { |