projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[cascardo/linux.git]
/
drivers
/
staging
/
rtl8192e
/
ieee80211
/
ieee80211_module.c
diff --git
a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
index
16256a3
..
12c2a18
100644
(file)
--- 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) {
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);
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;
}
kfree(crypt);
ieee->crypt[i] = NULL;
}