diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-28 13:11:28 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-28 13:11:28 -0700 |
| commit | 7d50d07da23995a18ac449636cb42aec2cb2808d (patch) | |
| tree | 0ddf940a5e9ddc5eeebc996601d7fee3c36ab836 /drivers/net/wireless/wl12xx/wl1251_sdio.c | |
| parent | 2decb194e65ab66eaf787512dc572cdc99893b24 (diff) | |
| parent | 6aa033d7efb85830535bb83cf6713d6025ae6e59 (diff) | |
Merge remote branch 'linus/master' into x86/cpu
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_sdio.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_sdio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_sdio.c b/drivers/net/wireless/wl12xx/wl1251_sdio.c index d234285c2c81..c561332e7009 100644 --- a/drivers/net/wireless/wl12xx/wl1251_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1251_sdio.c @@ -259,6 +259,7 @@ disable: sdio_disable_func(func); release: sdio_release_host(func); + wl1251_free_hw(wl); return ret; } |