diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-05 23:18:59 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-05 23:18:59 +0100 |
| commit | 4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a (patch) | |
| tree | 52046049957a87103a383869155f43461963f089 /drivers/net/wireless/mwl8k.c | |
| parent | mac80211: fix ampdu_action tx_start ssn (diff) | |
| parent | rt2x00: Properly request tx headroom for alignment operations. (diff) | |
| download | linux-4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a.tar.xz linux-4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/iface.c
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
| -rw-r--r-- | drivers/net/wireless/mwl8k.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 23a5a3442623..a04863633d1a 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -3196,8 +3196,10 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw, /* Clear unsupported feature flags */ *total_flags &= FIF_ALLMULTI | FIF_BCN_PRBRESP_PROMISC; - if (mwl8k_fw_lock(hw)) + if (mwl8k_fw_lock(hw)) { + kfree(cmd); return; + } if (priv->sniffer_enabled) { mwl8k_cmd_enable_sniffer(hw, 0); |