diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:34:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:34:34 -0400 |
| commit | 635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2 (patch) | |
| tree | 0456542caa85aff0f4edf91707e36850f76d585f /drivers/net/wireless/mwifiex/ie.c | |
| parent | 34202e28fe7fc8551313f9a035a8857db83de757 (diff) | |
| parent | b48d96652626b315229b1b82c6270eead6a77a6d (diff) | |
| download | blackbird-obmc-linux-635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2.tar.gz blackbird-obmc-linux-635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/ie.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/ie.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/ie.c b/drivers/net/wireless/mwifiex/ie.c index 328fb14d9e14..8374e33f195a 100644 --- a/drivers/net/wireless/mwifiex/ie.c +++ b/drivers/net/wireless/mwifiex/ie.c @@ -213,6 +213,7 @@ mwifiex_update_uap_custom_ie(struct mwifiex_private *priv, /* save assoc resp ie index after auto-indexing */ *assoc_idx = *((u16 *)pos); + kfree(ap_custom_ie); return ret; } |
