diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/net/wireless/iwmc3200wifi | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/commands.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c index f0c8acdb71a4..a68a2aff3c1e 100644 --- a/drivers/net/wireless/iwmc3200wifi/commands.c +++ b/drivers/net/wireless/iwmc3200wifi/commands.c | |||
| @@ -233,6 +233,7 @@ int iwm_store_rxiq_calib_result(struct iwm_priv *iwm) | |||
| 233 | eeprom_rxiq = iwm_eeprom_access(iwm, IWM_EEPROM_CALIB_RXIQ); | 233 | eeprom_rxiq = iwm_eeprom_access(iwm, IWM_EEPROM_CALIB_RXIQ); |
| 234 | if (IS_ERR(eeprom_rxiq)) { | 234 | if (IS_ERR(eeprom_rxiq)) { |
| 235 | IWM_ERR(iwm, "Couldn't access EEPROM RX IQ entry\n"); | 235 | IWM_ERR(iwm, "Couldn't access EEPROM RX IQ entry\n"); |
| 236 | kfree(rxiq); | ||
| 236 | return PTR_ERR(eeprom_rxiq); | 237 | return PTR_ERR(eeprom_rxiq); |
| 237 | } | 238 | } |
| 238 | 239 | ||