[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20180906032059.11160-1-yuehaibing@huawei.com>
Date: Thu, 6 Sep 2018 11:20:59 +0800
From: YueHaibing <yuehaibing@...wei.com>
To: <davem@...emloft.net>, <johannes.berg@...el.com>,
<emmanuel.grumbach@...el.com>, <luciano.coelho@...el.com>,
<linuxwifi@...el.com>, <kvalo@...eaurora.org>
CC: <linux-kernel@...r.kernel.org>, <netdev@...r.kernel.org>,
<linux-wireless@...r.kernel.org>,
YueHaibing <yuehaibing@...wei.com>
Subject: [PATCH v2] iwlwifi: Use kmemdup instead of duplicating it in iwl_parse_nvm_mcc_info
Replace calls to kzalloc followed by a memcpy with a direct call to
kmemdup.
Patch found using coccinelle.
Signed-off-by: YueHaibing <yuehaibing@...wei.com>
---
v2: fix a typo 'reg' --> 'regd'
---
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 27db4a3..bd91657 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -1113,14 +1113,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
regd_to_copy = sizeof(struct ieee80211_regdomain) +
valid_rules * sizeof(struct ieee80211_reg_rule);
- copy_rd = kzalloc(regd_to_copy, GFP_KERNEL);
+ copy_rd = kmemdup(regd, regd_to_copy, GFP_KERNEL);
if (!copy_rd) {
copy_rd = ERR_PTR(-ENOMEM);
goto out;
}
- memcpy(copy_rd, regd, regd_to_copy);
-
out:
kfree(regdb_ptrs);
kfree(regd);
--
2.7.0
Powered by blists - more mailing lists