---

yaml --- r: 134751 b: refs/heads/master c: e44578e h: refs/heads/master i: 134749: 0bf4a67 134747: bf8c440 134743: 76a9b79 134735: e15031c 134719: eb4263d v: v3
git-mirror · Feb 27, 2009 · d2729a2 · d2729a2
1 parent 9bd2f58
commit d2729a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6f26e4b0e1d63f466df7ae0fa35398316cf2dfc
+refs/heads/master: e44578ea7c4f87462e05e0d0a2dd43b6beecd5f6
diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c
@@ -2363,12 +2363,6 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
 	return -1;
 }
 
-/* Frees a general hso device */
-static void hso_free_device(struct hso_device *hso_dev)
-{
-	kfree(hso_dev);
-}
-
 /* Creates a general hso device */
 static struct hso_device *hso_create_device(struct usb_interface *intf,
 					    int port_spec)
@@ -2431,7 +2425,7 @@ static void hso_free_net_device(struct hso_device *hso_dev)
 		free_netdev(hso_net->net);
 	}
 
-	hso_free_device(hso_dev);
+	kfree(hso_dev);
 }
 
 /* initialize the network interface */
@@ -2645,7 +2639,7 @@ static void hso_free_serial_device(struct hso_device *hso_dev)
 	}
 	hso_free_tiomget(serial);
 	kfree(serial);
-	hso_free_device(hso_dev);
+	kfree(hso_dev);
 }
 
 /* Creates a bulk AT channel */
@@ -2726,7 +2720,7 @@ static struct hso_device *hso_create_bulk_serial_device(
 exit:
 	hso_free_tiomget(serial);
 	kfree(serial);
-	hso_free_device(hso_dev);
+	kfree(hso_dev);
 	return NULL;
 }
 
@@ -2785,7 +2779,7 @@ struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface,
 		kfree(serial);
 	}
 	if (hso_dev)
-		hso_free_device(hso_dev);
+		kfree(hso_dev);
 	return NULL;
 
 }