From 8dc64759ec4092ac23f8fe805aefba255687140d Mon Sep 17 00:00:00 2001 From: Reinette Chatre Date: Mon, 20 Apr 2009 14:37:01 -0700 Subject: [PATCH] --- yaml --- r: 143939 b: refs/heads/master c: 71d449b55abf5018d7c711b2b62abc0c083723c4 h: refs/heads/master i: 143937: 059374899fb410edbf0c1b9d33b0aa459aa1cb6a 143935: bab4882468ebee8e17c9229c795753dddbf4a196 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c043a5eb8b8..479055b29a04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b6f764e148a194f792e75d43dc3504bc0d81064 +refs/heads/master: 71d449b55abf5018d7c711b2b62abc0c083723c4 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c index da61ecd62882..1299479f99dc 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -5196,7 +5196,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group); iwl_rfkill_unregister(priv); - cancel_delayed_work(&priv->rfkill_poll); + cancel_delayed_work_sync(&priv->rfkill_poll); iwl3945_dealloc_ucode_pci(priv);