diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-09-22 18:14:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-27 14:34:07 -0400 |
commit | 7f90dce1ea9de432cf1f196c743a8d5a119e38ba (patch) | |
tree | a0168ed953d421deb1f669984c11e1808d1a11b4 /drivers/net/wireless/iwlwifi/iwl-agn-tt.c | |
parent | 1a8496137d3707061758df1f7df1e7700a4863fd (diff) |
iwlagn: use kcalloc when possible for array allocation
As everybody knows kcalloc checks the multiplication is safe and
that we don't run into overflow.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-tt.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c index 495f93664741..289e5d811383 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c | |||
@@ -641,11 +641,13 @@ void iwl_tt_initialize(struct iwl_priv *priv) | |||
641 | 641 | ||
642 | if (priv->cfg->base_params->adv_thermal_throttle) { | 642 | if (priv->cfg->base_params->adv_thermal_throttle) { |
643 | IWL_DEBUG_TEMP(priv, "Advanced Thermal Throttling\n"); | 643 | IWL_DEBUG_TEMP(priv, "Advanced Thermal Throttling\n"); |
644 | tt->restriction = kzalloc(sizeof(struct iwl_tt_restriction) * | 644 | tt->restriction = kcalloc(IWL_TI_STATE_MAX, |
645 | IWL_TI_STATE_MAX, GFP_KERNEL); | 645 | sizeof(struct iwl_tt_restriction), |
646 | tt->transaction = kzalloc(sizeof(struct iwl_tt_trans) * | 646 | GFP_KERNEL); |
647 | IWL_TI_STATE_MAX * (IWL_TI_STATE_MAX - 1), | 647 | tt->transaction = kcalloc(IWL_TI_STATE_MAX * |
648 | GFP_KERNEL); | 648 | (IWL_TI_STATE_MAX - 1), |
649 | sizeof(struct iwl_tt_trans), | ||
650 | GFP_KERNEL); | ||
649 | if (!tt->restriction || !tt->transaction) { | 651 | if (!tt->restriction || !tt->transaction) { |
650 | IWL_ERR(priv, "Fallback to Legacy Throttling\n"); | 652 | IWL_ERR(priv, "Fallback to Legacy Throttling\n"); |
651 | priv->thermal_throttle.advanced_tt = false; | 653 | priv->thermal_throttle.advanced_tt = false; |