---

yaml --- r: 237024 b: refs/heads/master c: d741900 h: refs/heads/master v: v3
git-mirror · Feb 4, 2011 · dd062d4 · dd062d4
1 parent b49f174
commit dd062d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78fc800f06a72c25842e585fd747fa6a98f3f0e5
+refs/heads/master: d741900d404b3a34bf478673f76ee9f16dad3f90
diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_chip.c b/trunk/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1407,6 +1407,9 @@ void zd_chip_disable_int(struct zd_chip *chip)
 	mutex_lock(&chip->mutex);
 	zd_usb_disable_int(&chip->usb);
 	mutex_unlock(&chip->mutex);
+
+	/* cancel pending interrupt work */
+	cancel_work_sync(&zd_chip_to_mac(chip)->process_intr);
 }
 
 int zd_chip_enable_rxtx(struct zd_chip *chip)