From 2662bce60372b60f8c323dbf20a8f35d19565260 Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Sun, 25 Mar 2012 08:43:24 +0200 Subject: [PATCH] BACKPORT: 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. Taken from kernel-next commit a855f7ee64fedbe831859d53b20650c2224afecc BUG=chromium-os:5542 TEST=emerge chromeos-kernel, make sure no warnings in iwl-mac80211.o Change-Id: I34bcd89a9d96a5baecf064c39ee34bc6e25c9c92 Signed-off-by: Oliver Hartkopp Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville Signed-off-by: Simon Que Reviewed-on: https://gerrit.chromium.org/gerrit/41487 Reviewed-by: Mandeep Singh Baines --- drivers/net/wireless/iwlwifi/iwl-mac80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index c24a7134a6f9a..095f4120754f5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c @@ -437,7 +437,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); @@ -458,6 +457,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 = -- 2.39.5