From c32e393c51063ced821a4f60b34dcbc61e2f8ba9 Mon Sep 17 00:00:00 2001
From: Xiaotian Feng <xtfeng@gmail.com>
Date: Wed, 31 Oct 2012 18:56:48 +0800
Subject: [PATCH] --- yaml --- r: 337487 b: refs/heads/master c:
 984a4a0378f609fc943e77d1beda900e8a6abaaf h: refs/heads/master i:   337485:
 acac1e3638ca28df22b822768e38d19f17e9ce38   337483:
 b88acbffe59eab5dfdd368b6996d9e88319313eb   337479:
 ccb4169e7ac15a24d7dd5d2a042a1bbda91f46b4   337471:
 3f8fce72355745270a1af10ff3a68975978b34de v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/ozwpan/ozhcd.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c40c62ceb107..099023b1026e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5df395404b43cfd111c36822b2e691619a408024
+refs/heads/master: 984a4a0378f609fc943e77d1beda900e8a6abaaf
diff --git a/trunk/drivers/staging/ozwpan/ozhcd.c b/trunk/drivers/staging/ozwpan/ozhcd.c
index 2e087acf1578..33c0009b3082 100644
--- a/trunk/drivers/staging/ozwpan/ozhcd.c
+++ b/trunk/drivers/staging/ozwpan/ozhcd.c
@@ -2304,8 +2304,8 @@ int oz_hcd_init(void)
  */
 void oz_hcd_term(void)
 {
-	tasklet_disable(&g_urb_process_tasklet);
-	tasklet_disable(&g_urb_cancel_tasklet);
+	tasklet_kill(&g_urb_process_tasklet);
+	tasklet_kill(&g_urb_cancel_tasklet);
 	platform_device_unregister(g_plat_dev);
 	platform_driver_unregister(&g_oz_plat_drv);
 	oz_trace("Pending urbs:%d\n", atomic_read(&g_pending_urbs));