summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorEliad Peller <eliadx.peller@intel.com>2014-01-05 12:41:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-06 11:33:57 -0800
commit4aca366c885d29df6ca9803c13fd92e2b4f42854 (patch)
tree83112b95194d9bbb155a5ea0590a211bee8df5ff /drivers/net
parent79a7d9a826165fcdde29bac4bec2f3da41f0a18a (diff)
iwlwifi: mvm: fix missing cleanup in .start() error path
commit 91b0d1198417cf4fd9a7bd4138b6909f0b359099 upstream. Cleanup of iwl_mvm_leds was missing in case of error, resulting in the following warning: WARNING: at lib/kobject.c:196 kobject_add_internal+0x1f4/0x210() kobject_add_internal failed for phy0-led with -EEXIST, don't try to register things with the same name in the same directory. which prevents further reloads of the driver. Signed-off-by: Eliad Peller <eliadx.peller@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/ops.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index d86083c6f445..bb5834200194 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -470,6 +470,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
out_unregister:
ieee80211_unregister_hw(mvm->hw);
+ iwl_mvm_leds_exit(mvm);
out_free:
iwl_phy_db_free(mvm->phy_db);
kfree(mvm->scan_cmd);