From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org, linux-wireless@vger.kernel.org,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Johannes Berg <johannes@sipsolutions.net>
Subject: [PATCH 3.10 6/8] iwlwifi: mvm: unregister leds when registration failed
Date: Wed, 21 Aug 2013 09:04:24 +0300 [thread overview]
Message-ID: <1377065066-13030-6-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1377065066-13030-1-git-send-email-emmanuel.grumbach@intel.com>
commit b7327d89ae694a89f9934d428bde520b77b31 upstream.
This was missing and prevented any further attempts
to load the module.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index b7e95b0..f7545e0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -243,7 +243,11 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
if (ret)
return ret;
- return ieee80211_register_hw(mvm->hw);
+ ret = ieee80211_register_hw(mvm->hw);
+ if (ret)
+ iwl_mvm_leds_exit(mvm);
+
+ return ret;
}
static void iwl_mvm_mac_tx(struct ieee80211_hw *hw,
--
1.7.10.4
next prev parent reply other threads:[~2013-08-21 6:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 6:04 [PATCH 3.10 1/8] iwlwifi: mvm: correctly configure MCAST in AP mode Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 2/8] iwlwifi: mvm: fix " Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 3/8] iwlwifi: mvm: properly tell the fw that a STA is awake Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 4/8] iwlwifi: mvm: don't set the MCAST queue in STA's queue list Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 5/8] iwlwifi: mvm: take the seqno from packet if transmit failed Emmanuel Grumbach
2013-08-21 6:04 ` Emmanuel Grumbach [this message]
2013-08-21 6:04 ` [PATCH 3.10 7/8] iwlwifi: bump required firmware API version for 3160/7260 Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 8/8] iwlwifi: mvm: adjust firmware D3 configuration API Emmanuel Grumbach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377065066-13030-6-git-send-email-emmanuel.grumbach@intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox