summaryrefslogtreecommitdiff
path: root/drivers/usb/net/rtl8150.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-09-14 01:07:18 +0400
committerPaul Mackerras <paulus@samba.org>2006-09-14 01:07:18 +0400
commitc547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch)
tree34af1fa64a63618660187ae58ad182665a1861ef /drivers/usb/net/rtl8150.c
parent3dd836a56de0d4f049438412959b905e1db4666e (diff)
parent63b98080daa35f0d682db04f4fb7ada010888752 (diff)
downloadlinux-c547fc28ab3e8716076fdaf4bd0260c5d63a18f7.tar.xz
Merge branch 'linux-2.6'
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 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)
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);