summaryrefslogtreecommitdiffstats
path: root/drivers/usb/net/rtl8150.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-04 06:41:37 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-04 06:41:37 -0400
commitf9bcda7760e1373615c9f6d9ce24209b0ab97de1 (patch)
treef90b3031126c4e4beb8161f38ea436303e2b8b73 /drivers/usb/net/rtl8150.c
parent9bec2e38527a9f2497b3d976715c672d08d6160d (diff)
parentc336923b668fdcf0312efbec3b44895d713f4d81 (diff)
downloadop-kernel-dev-f9bcda7760e1373615c9f6d9ce24209b0ab97de1.zip
op-kernel-dev-f9bcda7760e1373615c9f6d9ce24209b0ab97de1.tar.gz
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/net/rtl8150.c')
-rw-r--r--drivers/usb/net/rtl8150.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index bd09232..a72685b 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)
if (dev) {
set_bit(RTL8150_UNPLUG, &dev->flags);
tasklet_disable(&dev->tl);
+ tasklet_kill(&dev->tl);
unregister_netdev(dev->netdev);
unlink_all_urbs(dev);
free_all_urbs(dev);
OpenPOWER on IntegriCloud