aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-25 04:42:21 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-25 04:42:21 -0400
commitc649c0e31d5736a4b7c5c3454182091dda4bbe62 (patch)
tree93da11bf4ea828611ab5277a7dbadf57724c2b1e /drivers/net/wireless/iwlwifi/iwl3945-base.c
parentdaebafed7fef54fcc73d2d01431122cfd578d1e0 (diff)
parent4e2fd555199977c5994d1a4d2d3b8761b20ca4c7 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index c434f493daf5..5c10b87d0336 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2937,6 +2937,8 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
2937 2937
2938 mutex_lock(&priv->mutex); 2938 mutex_lock(&priv->mutex);
2939 2939
2940 cancel_delayed_work(&priv->scan_check);
2941
2940 if (!iwl_is_ready(priv)) { 2942 if (!iwl_is_ready(priv)) {
2941 IWL_WARN(priv, "request scan called when driver not ready.\n"); 2943 IWL_WARN(priv, "request scan called when driver not ready.\n");
2942 goto done; 2944 goto done;