From: Luca Coelho Date: Thu, 14 Feb 2019 06:59:27 +0000 (+0200) Subject: iwlwifi: remove unnecessary goto out in iwl_parse_nvm_mcc_info() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a2a120a9cdf13fa96b68f9d16f50d05e5a2c510e;p=openwrt%2Fstaging%2Fblogic.git iwlwifi: remove unnecessary goto out in iwl_parse_nvm_mcc_info() This goto out was unnecessary because the out label was immediately below it. Remove it. Signed-off-by: Luca Coelho --- diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index 2d11fc0e351f..e8ee510fdd4b 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -1193,10 +1193,8 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, */ copy_rd = kmemdup(regd, struct_size(regd, reg_rules, valid_rules), GFP_KERNEL); - if (!copy_rd) { + if (!copy_rd) copy_rd = ERR_PTR(-ENOMEM); - goto out; - } out: kfree(regdb_ptrs);