]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
iwlwifi: fix unused variable warning
authorOliver Hartkopp <socketcan@hartkopp.net>
Sun, 25 Mar 2012 06:43:24 +0000 (08:43 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Apr 2012 18:54:02 +0000 (14:54 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-mac80211.c

index 551db9eec884a3da592a4a186332fdfc6f81bb06..f1c675a2a6f335ae01469598d6c240aeaf326daa 100644 (file)
@@ -438,7 +438,6 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
        unsigned long flags;
        u32 base, status = 0xffffffff;
        int ret = -EIO;
-       const struct fw_img *img;
 
        IWL_DEBUG_MAC80211(priv, "enter\n");
        mutex_lock(&priv->mutex);
@@ -459,6 +458,8 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
                if (ret == 0) {
+                       const struct fw_img *img;
+
                        img = &(priv->fw->img[IWL_UCODE_WOWLAN]);
                        if (!priv->wowlan_sram) {
                                priv->wowlan_sram =