From d2729a2a342ddafc18439c4e4e76d4d9c8f985e5 Mon Sep 17 00:00:00 2001
From: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Date: Mon, 23 Feb 2009 05:58:27 +0000
Subject: [PATCH] --- yaml --- r: 134751 b: refs/heads/master c:
 e44578ea7c4f87462e05e0d0a2dd43b6beecd5f6 h: refs/heads/master i:   134749:
 0bf4a67b3839f6767ae0f99d36480b048d0f2855   134747:
 bf8c440c83b3cf3fc6b36b2f446efe82bc63da64   134743:
 76a9b79f7348124b12318df3bba3e108dc8b3356   134735:
 e15031c714db45179256bd3e70aa98900e2b211f   134719:
 eb4263dc47db3497be6afe462b815119f5514be2 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/usb/hso.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 993ee474c18f..42782e2ee2ec 100644
--- 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
index 0548edffd7cd..f49cc7b50c7e 100644
--- 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;
 
 }