From 582556b9367239d1f46dd825dc16487d1c81b538 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 14 Aug 2006 23:11:09 -0700
Subject: [PATCH] --- yaml --- r: 33779 b: refs/heads/master c:
 eff674a514bd3f59e0cae9b843e0665b576a5ed8 h: refs/heads/master i:   33777:
 b7bbe8a73f76a1e7ab2a9fb48e5487b3e9b1fd0a   33775:
 bcedd9ceff9effe49e0da824c3f6ba9ebb5c243d v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/net/rtl8150.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 52ef400e7956..aa538fdd3f60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9c770ed1fe2698c9a3b18e5fc12d1262e099c0c
+refs/heads/master: eff674a514bd3f59e0cae9b843e0665b576a5ed8
diff --git a/trunk/drivers/usb/net/rtl8150.c b/trunk/drivers/usb/net/rtl8150.c
index bd09232ce13c..a72685b96061 100644
--- a/trunk/drivers/usb/net/rtl8150.c
+++ b/trunk/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);