浏览代码

rndis_wlan: free priv correctly when rndis_wext_bind fails

Private structure is allocated by wiphy_new now, so use
wiphy_free instead of kfree.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Jussi Kivilinna 16 年之前
父节点
当前提交
eb1a685e07
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/net/wireless/rndis_wlan.c

+ 3 - 3
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);
 	set_wiphy_dev(wiphy, &usbdev->udev->dev);
 
 
 	if (wiphy_register(wiphy)) {
 	if (wiphy_register(wiphy)) {
-		wiphy_free(wiphy);
-		return -ENODEV;
+		retval = -ENODEV;
+		goto fail;
 	}
 	}
 
 
 	set_default_iw_params(usbdev);
 	set_default_iw_params(usbdev);
@@ -2472,7 +2472,7 @@ fail:
 	flush_workqueue(priv->workqueue);
 	flush_workqueue(priv->workqueue);
 	destroy_workqueue(priv->workqueue);
 	destroy_workqueue(priv->workqueue);
 
 
-	kfree(priv);
+	wiphy_free(wiphy);
 	return retval;
 	return retval;
 }
 }