diff options
| author | Ingo Molnar | 2009-11-04 11:54:15 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-11-04 11:59:45 +0100 |
| commit | a2e71271535fde493c32803b1f34789f97efcb5e (patch) | |
| tree | 90d7139bea2f49e947f27af92614fa6eca50b64d /drivers/staging/rtl8192e/ieee80211/ieee80211_module.c | |
| parent | perf symbols: Initialize dso->loaded (diff) | |
| parent | Linux 2.6.32-rc6 (diff) | |
| download | kernel-qcow2-linux-a2e71271535fde493c32803b1f34789f97efcb5e.tar.gz kernel-qcow2-linux-a2e71271535fde493c32803b1f34789f97efcb5e.tar.xz kernel-qcow2-linux-a2e71271535fde493c32803b1f34789f97efcb5e.zip | |
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211/ieee80211_module.c')
| -rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211_module.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c index 16256a31f993..12c2a18e1fa2 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c @@ -242,14 +242,8 @@ void free_ieee80211(struct net_device *dev) for (i = 0; i < WEP_KEYS; i++) { struct ieee80211_crypt_data *crypt = ieee->crypt[i]; if (crypt) { - if (crypt->ops) { + if (crypt->ops) crypt->ops->deinit(crypt->priv); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - module_put(crypt->ops->owner); -#else - __MOD_DEC_USE_COUNT(crypt->ops->owner); -#endif - } kfree(crypt); ieee->crypt[i] = NULL; } |