From dd062d4c16d0ce229c3fcf6d762822244e6afc20 Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Mon, 31 Jan 2011 20:47:17 +0200 Subject: [PATCH] --- yaml --- r: 237024 b: refs/heads/master c: d741900d404b3a34bf478673f76ee9f16dad3f90 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/zd1211rw/zd_chip.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0c695c38acf1..a3cc0b1fb8ec 100644 --- 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 index 6a9b66051cf7..b644ced848e7 100644 --- 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)