cy82c693: remove dead CY82C693_SETDMA_CLOCK code

[linux-2.6-omap-h63xx.git] / net / ieee80211 / ieee80211_module.c

diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index 69cb6aad25be0b6bf760492d6ca580c63883a026..949772a5a7dc15bd35152c3ada3df912681acfd7 100644 (file)
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -157,7 +157,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
        err = ieee80211_networks_allocate(ieee);
        if (err) {
                IEEE80211_ERROR("Unable to allocate beacon storage: %d\n", err);
-               goto failed;
+               goto failed_free_netdev;
        }
        ieee80211_networks_initialize(ieee);
 
@@ -181,9 +181,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
        ieee->ieee802_1x = 1;   /* Default to supporting 802.1x */
 
        INIT_LIST_HEAD(&ieee->crypt_deinit_list);
-       init_timer(&ieee->crypt_deinit_timer);
-       ieee->crypt_deinit_timer.data = (unsigned long)ieee;
-       ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler;
+       setup_timer(&ieee->crypt_deinit_timer, ieee80211_crypt_deinit_handler,
+                       (unsigned long)ieee);
        ieee->crypt_quiesced = 0;
 
        spin_lock_init(&ieee->lock);
@@ -194,9 +193,9 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
 
        return dev;
 
-      failed:
-       if (dev)
-               free_netdev(dev);
+failed_free_netdev:
+       free_netdev(dev);
+failed:
        return NULL;
 }