diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:27:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:27:36 +0200 |
| commit | 35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5 (patch) | |
| tree | adf37371beb73adbb0d2414a52d86580dd37d2e0 /drivers/net/wireless/mwifiex/ie.c | |
| parent | 5351da96bd6662d28c41a3e9e652019a11f3cf7c (diff) | |
| parent | cfda590178a16e2b5edb09e131460b3e64819807 (diff) | |
Merge branch 'picoxcell/timer' into next/timertimer
Imported from mailing list
* picoxcell/timer:
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 ceb82cd749cc..383820a52beb 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; } |