From eb8e474465bd68cd5e4d90e667cc579c7665b5ad Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Tue, 21 Apr 2009 19:48:15 +0300 Subject: [PATCH] --- yaml --- r: 149997 b: refs/heads/master c: eb1a685e07310b5137c561e25ab738292db2c8a5 h: refs/heads/master i: 149995: e697c886176eb1c274c4d5707a4892aa44c5ddfe v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rndis_wlan.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b3080e74a35e..970bc728c689 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d4d99ae89a8845a1d63b0529dd98da28dc0ff65 +refs/heads/master: eb1a685e07310b5137c561e25ab738292db2c8a5 diff --git a/trunk/drivers/net/wireless/rndis_wlan.c b/trunk/drivers/net/wireless/rndis_wlan.c index 9ef547d6724e..52fc647e6cb6 100644 --- a/trunk/drivers/net/wireless/rndis_wlan.c +++ b/trunk/drivers/net/wireless/rndis_wlan.c @@ -2449,8 +2449,8 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf) set_wiphy_dev(wiphy, &usbdev->udev->dev); if (wiphy_register(wiphy)) { - wiphy_free(wiphy); - return -ENODEV; + retval = -ENODEV; + goto fail; } set_default_iw_params(usbdev); @@ -2472,7 +2472,7 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf) flush_workqueue(priv->workqueue); destroy_workqueue(priv->workqueue); - kfree(priv); + wiphy_free(wiphy); return retval; }