diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-06-30 11:26:04 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-30 11:26:04 -0400 |
commit | 690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1 (patch) | |
tree | 9199b20addcd9167a210957ac477a284c6f9a73d /drivers/net/wireless/ath/ath5k | |
parent | 16adf5d07987d93675945f3cecf0e33706566005 (diff) | |
parent | a0b8de350be458b33248e48b2174d9af8a4c4798 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath5k')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/eeprom.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c index 1fef84f87c7..392771f9375 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.c +++ b/drivers/net/wireless/ath/ath5k/eeprom.c @@ -691,14 +691,12 @@ ath5k_eeprom_free_pcal_info(struct ath5k_hw *ah, int mode) if (!chinfo[pier].pd_curves) continue; - for (pdg = 0; pdg < ee->ee_pd_gains[mode]; pdg++) { + for (pdg = 0; pdg < AR5K_EEPROM_N_PD_CURVES; pdg++) { struct ath5k_pdgain_info *pd = &chinfo[pier].pd_curves[pdg]; - if (pd != NULL) { - kfree(pd->pd_step); - kfree(pd->pd_pwr); - } + kfree(pd->pd_step); + kfree(pd->pd_pwr); } kfree(chinfo[pier].pd_curves); |