diff options
| author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-05-25 19:58:22 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-06-11 22:28:38 +0400 |
| commit | fb3dddf22c63d7e0622d4819a87dbb8563f0e968 (patch) | |
| tree | c2f87ff85be78a8501189b8ac555f61eb44f262a /drivers/net/wireless/libertas/main.c | |
| parent | 6df3073d2923c12b6f7524917a634e83de958dfe (diff) | |
| download | linux-fb3dddf22c63d7e0622d4819a87dbb8563f0e968.tar.xz | |
[PATCH] libertas: changed some occurences of kmalloc() + memset(&a,0,sz) to kzalloc()
The subject says it all.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index f9369e50da3c..8c4fceaa486b 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -777,18 +777,14 @@ wlan_private *wlan_add_card(void *card) lbs_pr_err("init ethX device failed\n"); return NULL; } - priv = dev->priv; /* allocate buffer for wlan_adapter */ - if (!(priv->adapter = kmalloc(sizeof(wlan_adapter), GFP_KERNEL))) { + if (!(priv->adapter = kzalloc(sizeof(wlan_adapter), GFP_KERNEL))) { lbs_pr_err("allocate buffer for wlan_adapter failed\n"); - goto err_kmalloc; + goto err_kzalloc; } - /* init wlan_adapter */ - memset(priv->adapter, 0, sizeof(wlan_adapter)); - priv->wlan_dev.netdev = dev; priv->wlan_dev.card = card; priv->mesh_open = 0; @@ -802,14 +798,10 @@ wlan_private *wlan_add_card(void *card) dev->stop = wlan_close; dev->do_ioctl = libertas_do_ioctl; dev->set_mac_address = wlan_set_mac_address; - -#define WLAN_WATCHDOG_TIMEOUT (5 * HZ) - dev->tx_timeout = wlan_tx_timeout; dev->get_stats = wlan_get_stats; - dev->watchdog_timeo = WLAN_WATCHDOG_TIMEOUT; + dev->watchdog_timeo = 5 * HZ; dev->ethtool_ops = &libertas_ethtool_ops; - #ifdef WIRELESS_EXT dev->wireless_handlers = (struct iw_handler_def *)&libertas_handler_def; #endif @@ -875,7 +867,7 @@ err_registerdev: wake_up_interruptible(&priv->mainthread.waitq); wlan_terminate_thread(&priv->mainthread); kfree(priv->adapter); -err_kmalloc: +err_kzalloc: free_netdev(dev); lbs_deb_leave_args(LBS_DEB_NET, "priv NULL"); |