diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:24 -0400 |
| commit | f384c954c9fe3d3c6fce5ae66b67f2ddd947d098 (patch) | |
| tree | a38541b8083a2304435e9a153d408bd7cd44116e /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | 9a15a07fe2175dc25cd928a354b3839f562ac8cc (diff) | |
| parent | 5904b3b81d25166e5e39b9727645bb47937618e3 (diff) | |
Merge branch 'linus' into perf/core
Reason: Further changes conflict with upstream fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 5d3f51ff2f0d..386c5f96eff8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
| @@ -491,6 +491,7 @@ void iwl_bg_abort_scan(struct work_struct *work) | |||
| 491 | 491 | ||
| 492 | mutex_lock(&priv->mutex); | 492 | mutex_lock(&priv->mutex); |
| 493 | 493 | ||
| 494 | cancel_delayed_work_sync(&priv->scan_check); | ||
| 494 | set_bit(STATUS_SCAN_ABORTING, &priv->status); | 495 | set_bit(STATUS_SCAN_ABORTING, &priv->status); |
| 495 | iwl_send_scan_abort(priv); | 496 | iwl_send_scan_abort(priv); |
| 496 | 497 | ||