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>

diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
index aa9f31eadab242665471edb01322f70cd8e27b08..eebaf43f66b250294fbb37c908f7afaf214a24b5 100644 (file)
--- 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;