aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rndis_wlan.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 8505d8bcb69d..6eb487dcc42f 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2522,7 +2522,7 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)
2522 __le32 tmp; 2522 __le32 tmp;
2523 2523
2524 /* allocate rndis private data */ 2524 /* allocate rndis private data */
2525 priv = kmalloc(sizeof(struct rndis_wext_private), GFP_KERNEL); 2525 priv = kzalloc(sizeof(struct rndis_wext_private), GFP_KERNEL);
2526 if (!priv) 2526 if (!priv)
2527 return -ENOMEM; 2527 return -ENOMEM;
2528 2528
@@ -2530,8 +2530,6 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)
2530 * Otherwise we'll be in big trouble in rndis_wext_early_init(). 2530 * Otherwise we'll be in big trouble in rndis_wext_early_init().
2531 */ 2531 */
2532 usbdev->driver_priv = priv; 2532 usbdev->driver_priv = priv;
2533 memset(priv, 0, sizeof(*priv));
2534 memset(priv->name, 0, sizeof(priv->name));
2535 strcpy(priv->name, "IEEE802.11"); 2533 strcpy(priv->name, "IEEE802.11");
2536 usbdev->net->wireless_handlers = &rndis_iw_handlers; 2534 usbdev->net->wireless_handlers = &rndis_iw_handlers;
2537 priv->usbdev = usbdev; 2535 priv->usbdev = usbdev;