diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2008-07-01 07:44:48 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-07-08 14:21:33 (GMT) |
| commit | 8fa7425c6394117a541de82826d128d6c3d9161b (patch) | |
| tree | 1c9b9848e6a0c6ad2aa22e871f4e0f7c562077f4 | |
| parent | 9bb8582efb555521c7eec595ebd34e835ddc34b8 (diff) | |
| download | linux-8fa7425c6394117a541de82826d128d6c3d9161b.tar.xz | |
iwlwifi: fix error path of iwl_rfkill_init
This patch cleans rfkill error path. The problem was result of removing
the input device
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rfkill.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c index aa9f31e..eebaf43 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c +++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c @@ -101,17 +101,13 @@ int iwl_rfkill_init(struct iwl_priv *priv) ret = rfkill_register(priv->rfkill_mngr.rfkill); if (ret) { IWL_ERROR("Unable to register rfkill: %d\n", ret); - goto unregister_rfkill; + goto free_rfkill; } IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n"); return ret; -unregister_rfkill: - rfkill_unregister(priv->rfkill_mngr.rfkill); - priv->rfkill_mngr.rfkill = NULL; - -freed_rfkill: +free_rfkill: if (priv->rfkill_mngr.rfkill != NULL) rfkill_free(priv->rfkill_mngr.rfkill); priv->rfkill_mngr.rfkill = NULL; |