---

yaml --- r: 143939 b: refs/heads/master c: 71d449b h: refs/heads/master i: 143937: 0593748 143935: bab4882 v: v3
git-mirror · Apr 21, 2009 · 8dc6475 · 8dc6475
1 parent eb88da0
commit 8dc6475
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);