Blame SOURCES/0004-Revert-iwlwifi-remove-unnecessary-goto-out-in-iwl_pa.patch
|
 |
deb259 |
From 910c002de243c4fa4c053e61dbccd7cf2352fe74 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 11 Jul 2019 18:34:36 +0200
|
|
|
deb259 |
Subject: [PATCH] Revert "iwlwifi: remove unnecessary goto out in
|
|
|
deb259 |
iwl_parse_nvm_mcc_info()"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit a2a120a9cdf13fa96b68f9d16f50d05e5a2c510e.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 +++-
|
|
|
deb259 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
deb259 |
|
|
|
deb259 |
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
|
deb259 |
index d87a6bb3e456..2a879e0b331f 100644
|
|
|
deb259 |
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
|
deb259 |
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
|
deb259 |
@@ -1188,8 +1188,10 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
|
|
|
deb259 |
*/
|
|
|
deb259 |
copy_rd = kmemdup(regd, struct_size(regd, reg_rules, valid_rules),
|
|
|
deb259 |
GFP_KERNEL);
|
|
|
deb259 |
- if (!copy_rd)
|
|
|
deb259 |
+ if (!copy_rd) {
|
|
|
deb259 |
copy_rd = ERR_PTR(-ENOMEM);
|
|
|
deb259 |
+ goto out;
|
|
|
deb259 |
+ }
|
|
|
deb259 |
|
|
|
deb259 |
out:
|
|
|
deb259 |
kfree(regdb_ptrs);
|
|
|
deb259 |
--
|
|
|
deb259 |
2.13.6
|
|
|
deb259 |
|