diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-15 01:30:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-15 01:30:54 -0500 |
| commit | 5ecccb74dc91e22496a142b103ba958f93c29275 (patch) | |
| tree | b560b8974ec0e0478492d60753d45d8aea9db9b0 /drivers/net/wireless/iwmc3200wifi/rx.c | |
| parent | f6f223039c0d0683bdea1eabd35b309e10311a60 (diff) | |
| parent | 3d0beb921fa34ebf8b13e206e5473329b14deb83 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rate.c
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/rx.c')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index d32adeab68a3..ad8f7eabb5aa 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c | |||
| @@ -794,7 +794,7 @@ static int iwm_mlme_update_bss_table(struct iwm_priv *iwm, u8 *buf, | |||
| 794 | } | 794 | } |
| 795 | 795 | ||
| 796 | bss->bss = kzalloc(bss_len, GFP_KERNEL); | 796 | bss->bss = kzalloc(bss_len, GFP_KERNEL); |
| 797 | if (!bss) { | 797 | if (!bss->bss) { |
| 798 | kfree(bss); | 798 | kfree(bss); |
| 799 | IWM_ERR(iwm, "Couldn't allocate bss\n"); | 799 | IWM_ERR(iwm, "Couldn't allocate bss\n"); |
| 800 | return -ENOMEM; | 800 | return -ENOMEM; |