diff options
author | Mohamed Abbas <mabbas@linux.intel.com> | 2008-04-03 16:05:24 -0700 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-08 16:44:42 -0400 |
commit | 03d29c684917860f90f897565b297c4aba713e0b (patch) | |
tree | e2084248721b540fcaa468b4c0c2d2961e03c6b8 /drivers/net/wireless/iwlwifi/iwl-core.c | |
parent | fe00b5a5b7e29180e427e58b3d0a185d1dd3f105 (diff) |
iwlwifi: fix rfkill memory error
Do not free reference to device twice. After rfkill registration succeeds
we only need to call rfkill_unregister() and not rfkill_free().
Also add some debugging.
Signed-off-by: Mohamed Abbas <mabbas@linux.intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index f1223078055..d8a226e68ed 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -256,9 +256,13 @@ EXPORT_SYMBOL(iwl_setup); int iwlcore_low_level_notify(struct iwl_priv *priv, enum iwlcore_card_notify notify) { + int ret; switch (notify) { case IWLCORE_INIT_EVT: - iwl_rfkill_init(priv); + ret = iwl_rfkill_init(priv); + if (ret) + IWL_ERROR("Unable to initialize RFKILL system. " + "Ignoring error: %d\n", ret); break; case IWLCORE_START_EVT: break; @@ -266,7 +270,6 @@ int iwlcore_low_level_notify(struct iwl_priv *priv, break; case IWLCORE_REMOVE_EVT: iwl_rfkill_unregister(priv); - iwl_rfkill_free(priv); break; } |