diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
| commit | fc851fad00d7fa1bf4ac7034d9ba8041bf482d50 (patch) | |
| tree | 779a8b572d1701ef2c46755df751d9275650cdf4 /drivers/usb/net/rtl8150.c | |
| parent | 85cd7251b9112e3dabeac9fd3b175601ca607241 (diff) | |
| parent | f9bcda7760e1373615c9f6d9ce24209b0ab97de1 (diff) | |
Merge branch 'upstream' into pata-drivers
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); |