diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-02-10 12:35:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-10 12:35:24 -0800 |
| commit | 044c18c9f51a2b92b310e28bb121e55451b088dd (patch) | |
| tree | b57fb7cd9dc33412d6811b734664e90be26418c7 /drivers/net/wireless/iwmc3200wifi | |
| parent | via-velocity: Fix races on shared interrupts (diff) | |
| parent | rtl8187: Add new device ID (diff) | |
| download | linux-dev-044c18c9f51a2b92b310e28bb121e55451b088dd.tar.xz linux-dev-044c18c9f51a2b92b310e28bb121e55451b088dd.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
| -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 6d6ed7485175..f727b4a83196 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, } bss->bss = kzalloc(bss_len, GFP_KERNEL); - if (!bss) { + if (!bss->bss) { kfree(bss); IWM_ERR(iwm, "Couldn't allocate bss\n"); return -ENOMEM; |