diff options
author | Oliver Hartkopp <socketcan@hartkopp.net> | 2012-03-25 02:43:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-10 14:54:02 -0400 |
commit | a855f7ee64fedbe831859d53b20650c2224afecc (patch) | |
tree | b3dbb1b90939ae45ca1555ff864a43d9315fc674 /drivers/net | |
parent | 227842d1176019512d24236f7fb894f0fadd30d1 (diff) |
iwlwifi: fix unused variable warning
In the case of disabled CONFIG_IWLWIFI_DEBUGFS option the compiler complains
about the unused variable 'img'. Fix this by moving the 'img' definition.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-mac80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index 551db9eec884..f1c675a2a6f3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c | |||
@@ -438,7 +438,6 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) | |||
438 | unsigned long flags; | 438 | unsigned long flags; |
439 | u32 base, status = 0xffffffff; | 439 | u32 base, status = 0xffffffff; |
440 | int ret = -EIO; | 440 | int ret = -EIO; |
441 | const struct fw_img *img; | ||
442 | 441 | ||
443 | IWL_DEBUG_MAC80211(priv, "enter\n"); | 442 | IWL_DEBUG_MAC80211(priv, "enter\n"); |
444 | mutex_lock(&priv->mutex); | 443 | mutex_lock(&priv->mutex); |
@@ -459,6 +458,8 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) | |||
459 | 458 | ||
460 | #ifdef CONFIG_IWLWIFI_DEBUGFS | 459 | #ifdef CONFIG_IWLWIFI_DEBUGFS |
461 | if (ret == 0) { | 460 | if (ret == 0) { |
461 | const struct fw_img *img; | ||
462 | |||
462 | img = &(priv->fw->img[IWL_UCODE_WOWLAN]); | 463 | img = &(priv->fw->img[IWL_UCODE_WOWLAN]); |
463 | if (!priv->wowlan_sram) { | 464 | if (!priv->wowlan_sram) { |
464 | priv->wowlan_sram = | 465 | priv->wowlan_sram = |