---

yaml --- r: 254881 b: refs/heads/master c: 5e2cd08 h: refs/heads/master i: 254879: b752890 v: v3
git-mirror · Jul 8, 2011 · 640fb55 · 640fb55
1 parent 938aaa7
commit 640fb55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1f524e36cb691d20bfdaee423977f1decb81cf6
+refs/heads/master: 5e2cd0825a43824827b233d95bc47c0c970e5bef
diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c
@@ -2421,10 +2421,8 @@ static void hso_free_net_device(struct hso_device *hso_dev)
 
 	remove_net_device(hso_net->parent);
 
-	if (hso_net->net) {
+	if (hso_net->net)
 		unregister_netdev(hso_net->net);
-		free_netdev(hso_net->net);
-	}
 
 	/* start freeing */
 	for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
@@ -2436,6 +2434,9 @@ static void hso_free_net_device(struct hso_device *hso_dev)
 	kfree(hso_net->mux_bulk_tx_buf);
 	hso_net->mux_bulk_tx_buf = NULL;
 
+	if (hso_net->net)
+		free_netdev(hso_net->net);
+
 	kfree(hso_dev);
 }