diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/net/wireless/iwmc3200wifi/netdev.c | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/netdev.c')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c index e94e96955b99..092d28ae56a0 100644 --- a/drivers/net/wireless/iwmc3200wifi/netdev.c +++ b/drivers/net/wireless/iwmc3200wifi/netdev.c | |||
| @@ -156,10 +156,10 @@ void iwm_if_free(struct iwm_priv *iwm) | |||
| 156 | return; | 156 | return; |
| 157 | 157 | ||
| 158 | free_netdev(iwm_to_ndev(iwm)); | 158 | free_netdev(iwm_to_ndev(iwm)); |
| 159 | iwm_wdev_free(iwm); | ||
| 160 | iwm_priv_deinit(iwm); | 159 | iwm_priv_deinit(iwm); |
| 161 | kfree(iwm->umac_profile); | 160 | kfree(iwm->umac_profile); |
| 162 | iwm->umac_profile = NULL; | 161 | iwm->umac_profile = NULL; |
| 162 | iwm_wdev_free(iwm); | ||
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | int iwm_if_add(struct iwm_priv *iwm) | 165 | int iwm_if_add(struct iwm_priv *iwm) |