diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 14:40:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 14:40:37 -0400 |
| commit | d738752fc46c4cc339bc66346cf6134446ce08db (patch) | |
| tree | d7ca1400a1f6c4f53d4ecc8f1c83c810353b377b /drivers/usb/net/rtl8150.c | |
| parent | a930363881c225fb52824145d1ba8f1a8c447dd8 (diff) | |
| parent | db59b464f8708cdba857f16b183cff0b7466d6b5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
uhci-hcd: fix list access bug
USB: Support for ELECOM LD-USB20 in pegasus
USB: Add VIA quirk fixup for VT8235 usb2
USB: rtl8150_disconnect() needs tasklet_kill()
USB Storage: unusual_devs.h for Sony Ericsson M600i
USB Storage: Remove the finecam3 unusual_devs entry
UHCI: don't stop at an Iso error
usb gadget: g_ether spinlock recursion fix
USB: add all wacom device to hid-core.c blacklist
hid-core.c: Adds all GTCO CalComp Digitizers and InterWrite School Products to blacklist
USB floppy drive SAMSUNG SFD-321U/EP detected 8 times
Diffstat (limited to 'drivers/usb/net/rtl8150.c')
| -rw-r--r-- | drivers/usb/net/rtl8150.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c index bd09232ce13c..a72685b96061 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/usb/net/rtl8150.c | |||
| @@ -972,6 +972,7 @@ static void rtl8150_disconnect(struct usb_interface *intf) | |||
| 972 | if (dev) { | 972 | if (dev) { |
| 973 | set_bit(RTL8150_UNPLUG, &dev->flags); | 973 | set_bit(RTL8150_UNPLUG, &dev->flags); |
| 974 | tasklet_disable(&dev->tl); | 974 | tasklet_disable(&dev->tl); |
| 975 | tasklet_kill(&dev->tl); | ||
| 975 | unregister_netdev(dev->netdev); | 976 | unregister_netdev(dev->netdev); |
| 976 | unlink_all_urbs(dev); | 977 | unlink_all_urbs(dev); |
| 977 | free_all_urbs(dev); | 978 | free_all_urbs(dev); |