diff options
| author | Don Fry | 2012-03-15 21:27:05 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-04-09 22:37:47 +0200 |
| commit | 17acd0b64e23d92013621dc2caa3042ce6769770 (patch) | |
| tree | a4edbddf9a7a2a8a1b1b2115ac2af248da499e0a /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | iwlwifi: remove firmware info from iwl_shared (diff) | |
| download | kernel-qcow2-linux-17acd0b64e23d92013621dc2caa3042ce6769770.tar.gz kernel-qcow2-linux-17acd0b64e23d92013621dc2caa3042ce6769770.tar.xz kernel-qcow2-linux-17acd0b64e23d92013621dc2caa3042ce6769770.zip | |
iwlwifi: move FW_ERROR to priv
The op_mode should check for FW_ERROR before calling send_cmd. This
removes the need to test for FW_ERROR in the trans layer.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index f3e5c2aba266..56becf25656a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -69,7 +69,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv) if (!test_bit(STATUS_READY, &priv->status) || !test_bit(STATUS_GEO_CONFIGURED, &priv->status) || !test_bit(STATUS_SCAN_HW, &priv->status) || - test_bit(STATUS_FW_ERROR, &priv->shrd->status)) + test_bit(STATUS_FW_ERROR, &priv->status)) return -EIO; ret = iwl_dvm_send_cmd(priv, &cmd); |