From: Stanislaw Gruszka Date: Thu, 29 Jul 2010 09:37:41 +0000 (+0200) Subject: iwlwifi: fix scan abort X-Git-Tag: v2.6.36-rc1~571^2~64^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d28232b461b8d54b09e59325dbac8b0913ce2049;p=pandora-kernel.git iwlwifi: fix scan abort Fix possible double priv->mutex lock introduced by commit a69b03e941abae00380fc6bc1877fb797a1b31e6 "iwlwifi: cancel scan watchdog in iwl_bg_abort_scan" . We can not call cancel_delayed_work_sync(&priv->scan_check) with priv->mutex locked because workqueue function iwl_bg_scan_check() take that lock internally. We do not need to synchronize when canceling priv->scan_check work. We can avoid races (sending double abort command or send no command at all) using STATUS_SCAN_ABORT bit. Moreover current iwl_bg_scan_check() code seems to be broken, as we should not send abort commands when currently aborting. Signed-off-by: Stanislaw Gruszka CC: stable@kernel.org Signed-off-by: John W. Linville --- Reading git-diff-tree failed