Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa7425c authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

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: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9bb8582e

drivers/net/wireless/iwlwifi/iwl-rfkill.c

+2 −6
Original line number Diff line number Diff line
@@ -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;